From patchwork Tue Oct 13 09:35:25 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?q?Beno=C3=AEt_Th=C3=A9baudeau?= X-Patchwork-Id: 529642 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ozlabs.org (Postfix) with ESMTP id E245D1402C4 for ; Tue, 13 Oct 2015 20:35:59 +1100 (AEDT) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id A7229A30FD; Tue, 13 Oct 2015 09:35:58 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id oIiqQxG6CFZ3; Tue, 13 Oct 2015 09:35:53 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by fraxinus.osuosl.org (Postfix) with ESMTP id 8C69CA307C; Tue, 13 Oct 2015 09:35:51 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from fraxinus.osuosl.org (smtp4.osuosl.org [140.211.166.137]) by ash.osuosl.org (Postfix) with ESMTP id 56A8F1CE6D8 for ; Tue, 13 Oct 2015 09:35:46 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by fraxinus.osuosl.org (Postfix) with ESMTP id 534FCA3062 for ; Tue, 13 Oct 2015 09:35:46 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from fraxinus.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id fJSLuzqc_Od4 for ; Tue, 13 Oct 2015 09:35:44 +0000 (UTC) X-Greylist: from auto-whitelisted by SQLgrey-1.7.6 Received: from authsmtp.register.it (authsmtp90.register.it [195.110.122.175]) by fraxinus.osuosl.org (Postfix) with ESMTP id 52F809E2AA for ; Tue, 13 Oct 2015 09:35:43 +0000 (UTC) Received: from rad-ubuntu.home ([90.49.67.218]) by paganini31 with id UZbd1r0164iYwqa01ZbitY; Tue, 13 Oct 2015 11:35:42 +0200 X-Rid: benoit@wsystem.com@90.49.67.218 From: =?UTF-8?q?Beno=C3=AEt=20Th=C3=A9baudeau?= To: buildroot@buildroot.org Date: Tue, 13 Oct 2015 11:35:25 +0200 Message-Id: <1444728929-46246-4-git-send-email-benoit@wsystem.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1444728929-46246-1-git-send-email-benoit@wsystem.com> References: <1444728929-46246-1-git-send-email-benoit@wsystem.com> MIME-Version: 1.0 Cc: =?UTF-8?q?Beno=C3=AEt=20Th=C3=A9baudeau?= Subject: [Buildroot] [PATCH v2 4/8] package/dhcp: fix SysV init scripts output text X-BeenThere: buildroot@busybox.net X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: Discussion and development of buildroot List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: buildroot-bounces@busybox.net Sender: "buildroot" Fix various messages displayed by these scripts: - remove extra "dhcpd3" for `S80dhcp-server stop`, - make start-stop-daemon quiet in order to avoid extra messages like "stopped /usr/sbin/dhcpd (pid 174)" being output between the command description and its result, - fix the script names in the usage strings. Signed-off-by: Benoît Thébaudeau --- Changes v1 -> v2: - Rebase. - Use 'printf' instead of 'echo -n' following 0f75b2635ee564fbbdb9ea631cf39fa8731d6d6c. --- package/dhcp/S80dhcp-relay | 6 +++--- package/dhcp/S80dhcp-server | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/package/dhcp/S80dhcp-relay b/package/dhcp/S80dhcp-relay index 0f383e6..6493eda 100755 --- a/package/dhcp/S80dhcp-relay +++ b/package/dhcp/S80dhcp-relay @@ -33,12 +33,12 @@ DHCRELAYPID=/var/run/dhcrelay.pid case "$1" in start) printf "Starting DHCP relay: " - start-stop-daemon -S -x /usr/sbin/dhcrelay -- -q $OPTIONS $IFCMD $SERVERS + start-stop-daemon -S -q -x /usr/sbin/dhcrelay -- -q $OPTIONS $IFCMD $SERVERS [ $? = 0 ] && echo "OK" || echo "FAIL" ;; stop) printf "Stopping DHCP relay: " - start-stop-daemon -K -x /usr/sbin/dhcrelay + start-stop-daemon -K -q -x /usr/sbin/dhcrelay [ $? = 0 ] && echo "OK" || echo "FAIL" ;; restart | force-reload) @@ -47,7 +47,7 @@ case "$1" in $0 start ;; *) - echo "Usage: /etc/init.d/dhcp-relay {start|stop|restart|force-reload}" + echo "Usage: $0 {start|stop|restart|force-reload}" exit 1 esac diff --git a/package/dhcp/S80dhcp-server b/package/dhcp/S80dhcp-server index 079727b..c56e7c3 100755 --- a/package/dhcp/S80dhcp-server +++ b/package/dhcp/S80dhcp-server @@ -23,12 +23,12 @@ case "$1" in printf "Starting DHCP server: " test -d /var/lib/dhcp/ || mkdir -p /var/lib/dhcp/ test -f /var/lib/dhcp/dhcpd.leases || touch /var/lib/dhcp/dhcpd.leases - start-stop-daemon -S -x /usr/sbin/dhcpd -- -q $OPTIONS $INTERFACES + start-stop-daemon -S -q -x /usr/sbin/dhcpd -- -q $OPTIONS $INTERFACES [ $? = 0 ] && echo "OK" || echo "FAIL" ;; stop) - printf "Stopping DHCP server: dhcpd3" - start-stop-daemon -K -x /usr/sbin/dhcpd + printf "Stopping DHCP server: " + start-stop-daemon -K -q -x /usr/sbin/dhcpd [ $? = 0 ] && echo "OK" || echo "FAIL" ;; restart | force-reload) @@ -40,7 +40,7 @@ case "$1" in fi ;; *) - echo "Usage: /etc/init.d/dhcp-server {start|stop|restart|force-reload}" + echo "Usage: $0 {start|stop|restart|force-reload}" exit 1 esac