From patchwork Tue Apr 9 03:41:03 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paul Donald X-Patchwork-Id: 1921186 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@legolas.ozlabs.org Authentication-Results: legolas.ozlabs.org; dkim=pass (2048-bit key; secure) header.d=lists.infradead.org header.i=@lists.infradead.org header.a=rsa-sha256 header.s=bombadil.20210309 header.b=KcghLYVg; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.a=rsa-sha256 header.s=20230601 header.b=fIlOJ/P2; dkim-atps=neutral Authentication-Results: legolas.ozlabs.org; spf=none (no SPF record) smtp.mailfrom=lists.openwrt.org (client-ip=2607:7c80:54:3::133; helo=bombadil.infradead.org; envelope-from=openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org; receiver=patchwork.ozlabs.org) Received: from bombadil.infradead.org (bombadil.infradead.org [IPv6:2607:7c80:54:3::133]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature ECDSA (secp384r1) server-digest SHA384) (No client certificate requested) by legolas.ozlabs.org (Postfix) with ESMTPS id 4VDBgd1kCFz1yYH for ; Tue, 9 Apr 2024 13:45:33 +1000 (AEST) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender: Content-Transfer-Encoding:Content-Type:List-Subscribe:List-Help:List-Post: List-Archive:List-Unsubscribe:List-Id:MIME-Version:References:In-Reply-To: Message-ID:Date:Subject:To:From:Reply-To:Cc:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: List-Owner; bh=FLTzdpY1n8HtTg9UZCX/MtvxZIyvr174FN02ilzuFw4=; b=KcghLYVge46BYG N1LUNFI6SVjE3vEnRrvl/9csFjaS6MIcMv89rpoX1esdk/5qRVxW5zgHUh+TDA0zF4QtOQPHWqUsn Tvrsb4Ndef0mdPz9M3G6t2hQnRl1IXoIlMZivrQruXbUYDxtN5qtqOA9JLB9URS8ochUT4NNjJvj3 Vt1q19z7sjWRGc4j65/29+xPS8sikWYnvIlWXvPxYBtq+1ZZXsHwbPcWOPBF7WkKAa8LVnrt1Opog reY/llOwAqJk4P23sAZnyiZMx05VRhONG4TvzE6aWGZbB8oPBBe/NcPDefs5fmXz1LnVAJpsUYhDN 9CvNg7wzrstz9hydSH1Q==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.97.1 #2 (Red Hat Linux)) id 1ru2PE-00000000CJX-3lJb; Tue, 09 Apr 2024 03:44:20 +0000 Received: from mail-lj1-x22a.google.com ([2a00:1450:4864:20::22a]) by bombadil.infradead.org with esmtps (Exim 4.97.1 #2 (Red Hat Linux)) id 1ru2P4-00000000CEb-1zPI for openwrt-devel@lists.openwrt.org; Tue, 09 Apr 2024 03:44:12 +0000 Received: by mail-lj1-x22a.google.com with SMTP id 38308e7fff4ca-2d82713f473so88179741fa.3 for ; Mon, 08 Apr 2024 20:44:10 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20230601; t=1712634248; x=1713239048; darn=lists.openwrt.org; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:sender:from:to:cc:subject:date :message-id:reply-to; bh=svbBmpUnwB9Q5MUXctX7SMY6TVb1QTXJwF5tC5caJJs=; b=fIlOJ/P2nB1jp7WNY4+LQr7FZff8pFOG6KJlCkdI/q/W7ubhRILWA2ov8mEanKorgJ TtV9mYnjBDC2FWjflfh9r1syCCjVXJiX5AENaAdBOX6S1oJyY/GtFZNXrMGVdxZ9dScV s2au0sSbX6ZQiSsPDE0GSv+zN1um29ZwWrBGiTpwV+b2nTUgvAfLVXkjngYK4ZUNq2iX +hkfEcaHHusaF8u9iTDJjwSia/IzFUbnAxzX0xhrNJ19ZiMXDhYF+hIAfbwcI3rkVKLk 1xtLnfPfNIY4R5PJaw88Y6Yldq39mXN9W1Yzy/7AUO08nsih6VmigNcbYUQ8ZCBkjc6D YfhQ== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20230601; t=1712634248; x=1713239048; h=content-transfer-encoding:mime-version:references:in-reply-to :message-id:date:subject:to:from:sender:x-gm-message-state:from:to :cc:subject:date:message-id:reply-to; bh=svbBmpUnwB9Q5MUXctX7SMY6TVb1QTXJwF5tC5caJJs=; b=weGU1+JdsIIff4PiFn6APXE0PDTR9d/zzcKC+XW2wbz8ROJps8G4M7Ifq2okY2WewJ dlPQY9OsfcOxJF3srO1n7TelleE/0wxmQyDyJvI0YVTN5TBwG82rwIH60qWpZmxUUdEz IAGmOwIhQrHIcmRbfyifHr0/D4ZMojaSMMTgLfT+5xtN1YlFAHCvLBZekIxqAK11ifq8 KZp2uIddBh+csqsJPYFsm1kb3ZGeV58QUxHZqQ4BHVsJGGBZx9v8lhWVxbio7bsJL65k abRW+iarZ2ggG23GME2ZEdmsT3x3l4xHcgicf6kZmBvUpp/RPeAdHCaj1ibJuj+DNzHK Ws9w== X-Gm-Message-State: AOJu0YwMOXjA0oglUmckVcvNlKmWq0zhuZvuzIdkLxwxxPUx+j1lbV8W U05oDUaPgKLWvBpFeFY8eZ+/fLx2mAVS6onKw0yTvnvfIL04REeksT5b8jdv X-Google-Smtp-Source: AGHT+IH34raZpDrEzrDbit/Z4cuv7MUdYuXBCFYvasV12Slp3FsDn2TaJgBzeeqkDLdqCG8JKjthPQ== X-Received: by 2002:a2e:918e:0:b0:2d6:87d7:601 with SMTP id f14-20020a2e918e000000b002d687d70601mr9018939ljg.9.1712634248314; Mon, 08 Apr 2024 20:44:08 -0700 (PDT) Received: from blackhol3 ([2001:9b0:40::cae3:cb03]) by smtp.gmail.com with ESMTPSA id n9-20020a2e86c9000000b002d2191e20e1sm1374790ljj.92.2024.04.08.20.44.08 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 08 Apr 2024 20:44:08 -0700 (PDT) From: Paul Donald To: OpenWrt Development List Subject: [PATCH v2 3/7] lldpd: fix restart Date: Tue, 9 Apr 2024 05:41:03 +0200 Message-ID: <20240409034405.78194-4-newtwen+github@gmail.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240409034405.78194-1-newtwen+github@gmail.com> References: <20240402130221.58706-1-newtwen+github@gmail.com> <20240409034405.78194-1-newtwen+github@gmail.com> MIME-Version: 1.0 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20240408_204410_554669_7A229F17 X-CRM114-Status: GOOD ( 11.49 ) X-Spam-Score: -0.2 (/) X-Spam-Report: Spam detection software, running on the system "bombadil.infradead.org", has NOT identified this incoming email as spam. The original message has been attached to this so you can view it or label similar future email. If you have any questions, see the administrator of that system for details. Content preview: redirection broke in 5364fe0f01ca11b47c55d78f756d3176748dd0c2 redirects to /dev/null shall be handled correctly (i.e. last). This fixes these errors on `/etc/init.d/lldpd reload`: Content analysis details: (-0.2 points, 5.0 required) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at https://www.dnswl.org/, no trust [2a00:1450:4864:20:0:0:0:22a listed in] [list.dnswl.org] -0.0 SPF_PASS SPF: sender matches SPF record 0.0 SPF_HELO_NONE SPF: HELO does not publish an SPF Record 0.1 DKIM_SIGNED Message has a DKIM or DK signature, not necessarily valid -0.1 DKIM_VALID Message has at least one valid DKIM or DK signature -0.1 DKIM_VALID_AU Message has a valid DKIM or DK signature from author's domain -0.1 DKIM_VALID_EF Message has a valid DKIM or DK signature from envelope-from domain 0.0 FREEMAIL_FROM Sender email is commonly abused enduser mail provider [newtwen+github(at)gmail.com] X-BeenThere: openwrt-devel@lists.openwrt.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: OpenWrt Development List List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "openwrt-devel" Errors-To: openwrt-devel-bounces+incoming=patchwork.ozlabs.org@lists.openwrt.org redirection broke in 5364fe0f01ca11b47c55d78f756d3176748dd0c2 redirects to /dev/null shall be handled correctly (i.e. last). This fixes these errors on `/etc/init.d/lldpd reload`: 2024-03-16T20:39:00 [WARN/lldpctl] unknown command from argument 1: `/dev/null` 2024-03-16T20:39:00 [WARN/lldpctl] unknown command from argument 1: `/dev/null` 2024-03-16T20:39:00 [WARN/lldpctl] unknown command from argument 1: `/dev/null` 2024-03-16T20:39:00 [WARN/lldpctl] unknown command from argument 1: `/dev/null` Tested on: 22.03.6 Signed-off-by: Paul Donald --- package/network/services/lldpd/files/lldpd.init | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/package/network/services/lldpd/files/lldpd.init b/package/network/services/lldpd/files/lldpd.init index 069c8fee80..0334156fee 100644 --- a/package/network/services/lldpd/files/lldpd.init +++ b/package/network/services/lldpd/files/lldpd.init @@ -363,7 +363,7 @@ reload_service() { return 0 fi - $LLDPCLI -u "$LLDPSOCKET" 2>&1 /dev/null <<-EOF + $LLDPCLI -u "$LLDPSOCKET" >/dev/null 2>&1 <<-EOF pause unconfigure lldp custom-tlv unconfigure system interface pattern @@ -373,7 +373,7 @@ reload_service() { unconfigure system platform EOF if [ "$CONFIG_LLDPD_WITH_LLDPMED" = "y" ]; then - $LLDPCLI -u "$LLDPSOCKET" 2>&1 /dev/null <<-EOF + $LLDPCLI -u "$LLDPSOCKET" >/dev/null 2>&1 <<-EOF unconfigure med fast-start EOF @@ -381,9 +381,9 @@ reload_service() { # Rewrite lldpd.conf # If something changed it should be included by the lldpcli call write_lldpd_conf - $LLDPCLI -u "$LLDPSOCKET" -c "$LLDPD_CONF" -c "$LLDPD_CONFS_DIR" 2>&1 /dev/null + $LLDPCLI -u "$LLDPSOCKET" -c "$LLDPD_CONF" -c "$LLDPD_CONFS_DIR" >/dev/null 2>&1 # Broadcast update over the wire - $LLDPCLI -u "$LLDPSOCKET" 2>&1 /dev/null <<-EOF + $LLDPCLI -u "$LLDPSOCKET" >/dev/null 2>&1 <<-EOF resume update EOF @@ -391,6 +391,6 @@ reload_service() { } stop_service() { - rm -rf ${LLDPD_RUN} "$LLDPSOCKET" 2> /dev/null + rm -rf ${LLDPD_RUN} "$LLDPSOCKET" >/dev/null 2>&1 }