* [Buildroot] [PATCH 1/1] package/ntp: base sysv script on current template
@ 2019-11-05 12:24 Simon Rowe
2019-11-06 10:48 ` Carlos Santos
` (2 more replies)
0 siblings, 3 replies; 4+ messages in thread
From: Simon Rowe @ 2019-11-05 12:24 UTC (permalink / raw)
To: buildroot
Signed-off-by: Simon Rowe <simon.rowe@citrix.com>
---
package/ntp/S49ntp | 80 ++++++++++++++++++++++++++++++++++--------------------
1 file changed, 51 insertions(+), 29 deletions(-)
diff --git a/package/ntp/S49ntp b/package/ntp/S49ntp
index 35e5874..66c5f70 100644
--- a/package/ntp/S49ntp
+++ b/package/ntp/S49ntp
@@ -1,34 +1,56 @@
-#! /bin/sh
+#!/bin/sh
+#
+# Starts Network Time Protocol daemon
+#
-NAME=ntpd
+DAEMON="ntpd"
+PIDFILE="/var/run/$DAEMON.pid"
-# Read config file if it is present.
-if [ -r /etc/default/$NAME ]
-then
- . /etc/default/$NAME
-fi
+NTPD_ARGS="-g"
+
+# shellcheck source=/dev/null
+[ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON"
+
+start() {
+ printf 'Starting %s: ' "$DAEMON"
+ # shellcheck disable=SC2086 # we need the word splitting
+ start-stop-daemon -S -q -p "$PIDFILE" -x "/usr/sbin/$DAEMON" \
+ -- $NTPD_ARGS -p "$PIDFILE"
+ status=$?
+ if [ "$status" -eq 0 ]; then
+ echo "OK"
+ else
+ echo "FAIL"
+ fi
+ return "$status"
+}
+
+stop() {
+ printf 'Stopping %s: ' "$DAEMON"
+ start-stop-daemon -K -q -p "$PIDFILE"
+ status=$?
+ if [ "$status" -eq 0 ]; then
+ rm -f "$PIDFILE"
+ echo "OK"
+ else
+ echo "FAIL"
+ fi
+ return "$status"
+}
+
+restart() {
+ stop
+ sleep 1
+ start
+}
case "$1" in
- start)
- printf "Starting $NAME: "
- start-stop-daemon -S -q -x /usr/sbin/ntpd -- -g
- [ $? = 0 ] && echo "OK" || echo "FAIL"
- ;;
- stop)
- printf "Stopping $NAME: "
- start-stop-daemon -K -q -n $NAME
- [ $? = 0 ] && echo "OK" || echo "FAIL"
- ;;
- restart|reload)
- echo "Restarting $NAME: "
- $0 stop
- sleep 1
- $0 start
- ;;
- *)
- echo "Usage: $0 {start|stop|restart|reload}" >&2
- exit 1
- ;;
+ start|stop|restart)
+ "$1";;
+ reload)
+ # Restart, since there is no true "reload" feature.
+ restart;;
+ *)
+ echo "Usage: $0 {start|stop|restart|reload}"
+ exit 1
esac
-
-exit 0
--
1.8.3.1
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [Buildroot] [PATCH 1/1] package/ntp: base sysv script on current template
2019-11-05 12:24 [Buildroot] [PATCH 1/1] package/ntp: base sysv script on current template Simon Rowe
@ 2019-11-06 10:48 ` Carlos Santos
2019-12-03 14:15 ` Simon Rowe
2020-09-03 18:57 ` Thomas Petazzoni
2 siblings, 0 replies; 4+ messages in thread
From: Carlos Santos @ 2019-11-06 10:48 UTC (permalink / raw)
To: buildroot
On Tue, Nov 5, 2019 at 9:24 AM Simon Rowe <simon.rowe@citrix.com> wrote:
>
> Signed-off-by: Simon Rowe <simon.rowe@citrix.com>
> ---
> package/ntp/S49ntp | 80 ++++++++++++++++++++++++++++++++++--------------------
> 1 file changed, 51 insertions(+), 29 deletions(-)
>
> diff --git a/package/ntp/S49ntp b/package/ntp/S49ntp
> index 35e5874..66c5f70 100644
> --- a/package/ntp/S49ntp
> +++ b/package/ntp/S49ntp
> @@ -1,34 +1,56 @@
> -#! /bin/sh
> +#!/bin/sh
> +#
> +# Starts Network Time Protocol daemon
> +#
>
> -NAME=ntpd
> +DAEMON="ntpd"
> +PIDFILE="/var/run/$DAEMON.pid"
>
> -# Read config file if it is present.
> -if [ -r /etc/default/$NAME ]
> -then
> - . /etc/default/$NAME
> -fi
> +NTPD_ARGS="-g"
> +
> +# shellcheck source=/dev/null
> +[ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON"
> +
> +start() {
> + printf 'Starting %s: ' "$DAEMON"
> + # shellcheck disable=SC2086 # we need the word splitting
> + start-stop-daemon -S -q -p "$PIDFILE" -x "/usr/sbin/$DAEMON" \
> + -- $NTPD_ARGS -p "$PIDFILE"
> + status=$?
> + if [ "$status" -eq 0 ]; then
> + echo "OK"
> + else
> + echo "FAIL"
> + fi
> + return "$status"
> +}
> +
> +stop() {
> + printf 'Stopping %s: ' "$DAEMON"
> + start-stop-daemon -K -q -p "$PIDFILE"
> + status=$?
> + if [ "$status" -eq 0 ]; then
> + rm -f "$PIDFILE"
> + echo "OK"
> + else
> + echo "FAIL"
> + fi
> + return "$status"
> +}
> +
> +restart() {
> + stop
> + sleep 1
> + start
> +}
>
> case "$1" in
> - start)
> - printf "Starting $NAME: "
> - start-stop-daemon -S -q -x /usr/sbin/ntpd -- -g
> - [ $? = 0 ] && echo "OK" || echo "FAIL"
> - ;;
> - stop)
> - printf "Stopping $NAME: "
> - start-stop-daemon -K -q -n $NAME
> - [ $? = 0 ] && echo "OK" || echo "FAIL"
> - ;;
> - restart|reload)
> - echo "Restarting $NAME: "
> - $0 stop
> - sleep 1
> - $0 start
> - ;;
> - *)
> - echo "Usage: $0 {start|stop|restart|reload}" >&2
> - exit 1
> - ;;
> + start|stop|restart)
> + "$1";;
> + reload)
> + # Restart, since there is no true "reload" feature.
> + restart;;
> + *)
> + echo "Usage: $0 {start|stop|restart|reload}"
> + exit 1
> esac
> -
> -exit 0
> --
> 1.8.3.1
>
> _______________________________________________
> buildroot mailing list
> buildroot at busybox.net
> http://lists.busybox.net/mailman/listinfo/buildroot
Tested-by: Carlos Santos <unixmania@gmail.com>
^ permalink raw reply [flat|nested] 4+ messages in thread
* [Buildroot] [PATCH 1/1] package/ntp: base sysv script on current template
2019-11-05 12:24 [Buildroot] [PATCH 1/1] package/ntp: base sysv script on current template Simon Rowe
2019-11-06 10:48 ` Carlos Santos
@ 2019-12-03 14:15 ` Simon Rowe
2020-09-03 18:57 ` Thomas Petazzoni
2 siblings, 0 replies; 4+ messages in thread
From: Simon Rowe @ 2019-12-03 14:15 UTC (permalink / raw)
To: buildroot
On 05/11/2019 12:24, Simon Rowe wrote:
> Signed-off-by: Simon Rowe <simon.rowe@citrix.com>
> ---
> package/ntp/S49ntp | 80 ++++++++++++++++++++++++++++++++++--------------------
> 1 file changed, 51 insertions(+), 29 deletions(-)
>
> diff --git a/package/ntp/S49ntp b/package/ntp/S49ntp
> index 35e5874..66c5f70 100644
> --- a/package/ntp/S49ntp
> +++ b/package/ntp/S49ntp
> @@ -1,34 +1,56 @@
> -#! /bin/sh
> +#!/bin/sh
> +#
> +# Starts Network Time Protocol daemon
> +#
>
> -NAME=ntpd
> +DAEMON="ntpd"
> +PIDFILE="/var/run/$DAEMON.pid"
>
> -# Read config file if it is present.
> -if [ -r /etc/default/$NAME ]
> -then
> - . /etc/default/$NAME
> -fi
> +NTPD_ARGS="-g"
> +
> +# shellcheck source=/dev/null
> +[ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON"
> +
> +start() {
> + printf 'Starting %s: ' "$DAEMON"
> + # shellcheck disable=SC2086 # we need the word splitting
> + start-stop-daemon -S -q -p "$PIDFILE" -x "/usr/sbin/$DAEMON" \
> + -- $NTPD_ARGS -p "$PIDFILE"
> + status=$?
> + if [ "$status" -eq 0 ]; then
> + echo "OK"
> + else
> + echo "FAIL"
> + fi
> + return "$status"
> +}
> +
> +stop() {
> + printf 'Stopping %s: ' "$DAEMON"
> + start-stop-daemon -K -q -p "$PIDFILE"
> + status=$?
> + if [ "$status" -eq 0 ]; then
> + rm -f "$PIDFILE"
> + echo "OK"
> + else
> + echo "FAIL"
> + fi
> + return "$status"
> +}
> +
> +restart() {
> + stop
> + sleep 1
> + start
> +}
>
> case "$1" in
> - start)
> - printf "Starting $NAME: "
> - start-stop-daemon -S -q -x /usr/sbin/ntpd -- -g
> - [ $? = 0 ] && echo "OK" || echo "FAIL"
> - ;;
> - stop)
> - printf "Stopping $NAME: "
> - start-stop-daemon -K -q -n $NAME
> - [ $? = 0 ] && echo "OK" || echo "FAIL"
> - ;;
> - restart|reload)
> - echo "Restarting $NAME: "
> - $0 stop
> - sleep 1
> - $0 start
> - ;;
> - *)
> - echo "Usage: $0 {start|stop|restart|reload}" >&2
> - exit 1
> - ;;
> + start|stop|restart)
> + "$1";;
> + reload)
> + # Restart, since there is no true "reload" feature.
> + restart;;
> + *)
> + echo "Usage: $0 {start|stop|restart|reload}"
> + exit 1
> esac
> -
> -exit 0
>
Ping?
^ permalink raw reply [flat|nested] 4+ messages in thread
* [Buildroot] [PATCH 1/1] package/ntp: base sysv script on current template
2019-11-05 12:24 [Buildroot] [PATCH 1/1] package/ntp: base sysv script on current template Simon Rowe
2019-11-06 10:48 ` Carlos Santos
2019-12-03 14:15 ` Simon Rowe
@ 2020-09-03 18:57 ` Thomas Petazzoni
2 siblings, 0 replies; 4+ messages in thread
From: Thomas Petazzoni @ 2020-09-03 18:57 UTC (permalink / raw)
To: buildroot
On Tue, 5 Nov 2019 12:24:11 +0000
Simon Rowe <simon.rowe@citrix.com> wrote:
> Signed-off-by: Simon Rowe <simon.rowe@citrix.com>
> ---
> package/ntp/S49ntp | 80 ++++++++++++++++++++++++++++++++++--------------------
> 1 file changed, 51 insertions(+), 29 deletions(-)
Sorry for the long delay. Applied. Thanks!
Thomas
--
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2020-09-03 18:57 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2019-11-05 12:24 [Buildroot] [PATCH 1/1] package/ntp: base sysv script on current template Simon Rowe
2019-11-06 10:48 ` Carlos Santos
2019-12-03 14:15 ` Simon Rowe
2020-09-03 18:57 ` Thomas Petazzoni
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.