From: "Benoît Thébaudeau" <benoit.thebaudeau.dev@gmail.com>
To: buildroot@busybox.net
Subject: [Buildroot] [PATCH v3 07/13] package/dhcp: fix SysV init scripts output text
Date: Sun, 25 Oct 2015 02:59:33 +0200 [thread overview]
Message-ID: <1445734779-7212-7-git-send-email-benoit.thebaudeau.dev@gmail.com> (raw)
In-Reply-To: <1445734779-7212-1-git-send-email-benoit.thebaudeau.dev@gmail.com>
From: Beno?t Th?baudeau <benoit@wsystem.com>
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 <benoit@wsystem.com>
---
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
--
2.1.4
next prev parent reply other threads:[~2015-10-25 0:59 UTC|newest]
Thread overview: 47+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-25 0:59 [Buildroot] [PATCH v3 01/13] package/dhcp: fix SysV init scripts option passing Benoît Thébaudeau
2015-10-25 0:59 ` [Buildroot] [PATCH v3 02/13] package/dhcp: systemd: rename environment file Benoît Thébaudeau
2015-11-04 9:52 ` Maxime Hadjinlian
2015-11-04 9:54 ` Maxime Hadjinlian
2015-11-04 10:01 ` Benoît Thébaudeau
2015-11-04 10:04 ` Maxime Hadjinlian
2015-11-04 10:07 ` Benoît Thébaudeau
2015-11-04 10:13 ` Maxime Hadjinlian
2015-11-04 10:18 ` Thomas Petazzoni
2015-11-04 10:24 ` Benoît Thébaudeau
2015-11-04 10:25 ` Maxime Hadjinlian
2015-11-04 18:42 ` Gabe Evans
2015-12-24 14:00 ` Thomas Petazzoni
2015-10-25 0:59 ` [Buildroot] [PATCH v3 03/13] package/dhcp/S80dhcp-server: support extra options Benoît Thébaudeau
2015-12-24 14:00 ` Thomas Petazzoni
2015-10-25 0:59 ` [Buildroot] [PATCH v3 04/13] package/dhcp: systemd: " Benoît Thébaudeau
2015-11-04 10:09 ` Maxime Hadjinlian
2015-12-24 14:01 ` Thomas Petazzoni
2015-10-25 0:59 ` [Buildroot] [PATCH v3 05/13] package/dhcp/S80dhcp-server: allow empty INTERFACES Benoît Thébaudeau
2015-12-24 14:02 ` Thomas Petazzoni
2015-10-25 0:59 ` [Buildroot] [PATCH v3 06/13] package/dhcp: systemd: allow missing environment file Benoît Thébaudeau
2015-11-04 10:14 ` Maxime Hadjinlian
2015-12-24 14:03 ` Thomas Petazzoni
2015-10-25 0:59 ` Benoît Thébaudeau [this message]
2015-12-24 14:05 ` [Buildroot] [PATCH v3 07/13] package/dhcp: fix SysV init scripts output text Thomas Petazzoni
2015-10-25 0:59 ` [Buildroot] [PATCH v3 08/13] package/dhcp: remove sleep from SysV init scripts restart Benoît Thébaudeau
2015-12-24 14:06 ` Thomas Petazzoni
2015-10-25 0:59 ` [Buildroot] [PATCH v3 09/13] package/dhcp: SysV init scripts: remove PID files after stop Benoît Thébaudeau
2015-12-24 14:26 ` Thomas Petazzoni
2016-01-07 20:40 ` Benoît Thébaudeau
2015-10-25 0:59 ` [Buildroot] [PATCH v3 10/13] package/dhcp/S80dhcp-server: support IPv6 lease file Benoît Thébaudeau
2015-10-25 0:59 ` [Buildroot] [PATCH v3 11/13] package/dhcp: systemd: " Benoît Thébaudeau
2015-11-04 10:21 ` Maxime Hadjinlian
2015-11-04 10:36 ` Benoît Thébaudeau
2015-11-04 10:53 ` Maxime Hadjinlian
2015-11-04 11:15 ` Benoît Thébaudeau
2015-11-04 11:31 ` Maxime Hadjinlian
2015-11-09 10:49 ` Benoît Thébaudeau
2015-11-12 10:42 ` Maxime Hadjinlian
2015-11-15 17:55 ` Benoît Thébaudeau
2015-10-25 0:59 ` [Buildroot] [PATCH v3 12/13] package/dhcp: SysV init scripts: refactor using functions Benoît Thébaudeau
2015-10-25 0:59 ` [Buildroot] [PATCH v3 13/13] package/dhcp: systemd: add dhcrelay service file Benoît Thébaudeau
2015-11-04 11:24 ` Maxime Hadjinlian
2015-11-04 13:35 ` Benoît Thébaudeau
2015-11-04 21:26 ` Arnout Vandecappelle
2015-11-15 17:36 ` Benoît Thébaudeau
2015-12-24 13:59 ` [Buildroot] [PATCH v3 01/13] package/dhcp: fix SysV init scripts option passing Thomas Petazzoni
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1445734779-7212-7-git-send-email-benoit.thebaudeau.dev@gmail.com \
--to=benoit.thebaudeau.dev@gmail.com \
--cc=buildroot@busybox.net \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox