From patchwork Sun Oct 25 00:59:33 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: 535519 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from silver.osuosl.org (smtp3.osuosl.org [140.211.166.136]) by ozlabs.org (Postfix) with ESMTP id 0321E14131D for ; Sun, 25 Oct 2015 12:00:32 +1100 (AEDT) Authentication-Results: ozlabs.org; dkim=fail reason="signature verification failed" (2048-bit key; unprotected) header.d=gmail.com header.i=@gmail.com header.b=hwAmbDCF; dkim-atps=neutral Received: from localhost (localhost [127.0.0.1]) by silver.osuosl.org (Postfix) with ESMTP id E9D8B30A61; Sun, 25 Oct 2015 01:00:29 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from silver.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id QfD+XshmElOA; Sun, 25 Oct 2015 01:00:23 +0000 (UTC) Received: from ash.osuosl.org (ash.osuosl.org [140.211.166.34]) by silver.osuosl.org (Postfix) with ESMTP id 746EF31A4A; Sun, 25 Oct 2015 01:00:08 +0000 (UTC) X-Original-To: buildroot@lists.busybox.net Delivered-To: buildroot@osuosl.org Received: from whitealder.osuosl.org (smtp1.osuosl.org [140.211.166.138]) by ash.osuosl.org (Postfix) with ESMTP id D97031C0BE0 for ; Sun, 25 Oct 2015 00:59:55 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by whitealder.osuosl.org (Postfix) with ESMTP id D3B618A09E for ; Sun, 25 Oct 2015 00:59:55 +0000 (UTC) X-Virus-Scanned: amavisd-new at osuosl.org Received: from whitealder.osuosl.org ([127.0.0.1]) by localhost (.osuosl.org [127.0.0.1]) (amavisd-new, port 10024) with ESMTP id lDu50nZc7bN2 for ; Sun, 25 Oct 2015 00:59:55 +0000 (UTC) X-Greylist: domain auto-whitelisted by SQLgrey-1.7.6 Received: from mail-wi0-f171.google.com (mail-wi0-f171.google.com [209.85.212.171]) by whitealder.osuosl.org (Postfix) with ESMTPS id ABD0F87AD2 for ; Sun, 25 Oct 2015 00:59:54 +0000 (UTC) Received: by wicfv8 with SMTP id fv8so73574182wic.0 for ; Sat, 24 Oct 2015 17:59:53 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20120113; h=from:to:cc:subject:date:message-id:in-reply-to:references :mime-version:content-type:content-transfer-encoding; bh=qCmiy/+h6ayyzClcQNNk/oFYTThGbYv3fBpaF43RhAY=; b=hwAmbDCFwEBxTtDczza/6Cl2GAw/2+wg+5O6qA19BX3huDusujMpSI4mQgIwqW5P8x ermIhZQ0ZrifsFTUnsY6QUShqRJ1EIhOyPKlzPbY/c12nqOHkszRMkaR8gFrcDa5/a0m jyRCuvE2qwo45LugoSy0LAkkV02/a6CBcnFtVXAReGHa3gmnssgs0W24m6U9xCpgp2Ss WU48SPAkpr+ZpX66sFa1EVk69RZQ49tSh0LBIeEq8csfeDYa4y+4iOZa/8fFfmEJ4ulZ D6pSIxlYgFmdjrhEcZJRPc0udlyIW2aNRzuAUeDM5mn4UO1mNSfZwIABDWyUZgry7AQp v2uw== X-Received: by 10.180.8.163 with SMTP id s3mr96676wia.70.1445734793363; Sat, 24 Oct 2015 17:59:53 -0700 (PDT) Received: from localhost.localdomain (vno44-1-88-172-188-148.fbx.proxad.net. [88.172.188.148]) by smtp.gmail.com with ESMTPSA id jd9sm8406757wic.0.2015.10.24.17.59.52 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-SHA bits=128/128); Sat, 24 Oct 2015 17:59:52 -0700 (PDT) From: =?UTF-8?q?Beno=C3=AEt=20Th=C3=A9baudeau?= To: Date: Sun, 25 Oct 2015 02:59:33 +0200 Message-Id: <1445734779-7212-7-git-send-email-benoit.thebaudeau.dev@gmail.com> X-Mailer: git-send-email 2.1.4 In-Reply-To: <1445734779-7212-1-git-send-email-benoit.thebaudeau.dev@gmail.com> References: <1445734779-7212-1-git-send-email-benoit.thebaudeau.dev@gmail.com> MIME-Version: 1.0 Cc: Thomas Petazzoni , =?UTF-8?q?Beno=C3=AEt=20Th=C3=A9baudeau?= Subject: [Buildroot] [PATCH v3 07/13] 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" From: Benoît Thébaudeau 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 v2 -> v3: none. 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