package/mpd: rebase init script on layout introduced by openssh
PATCH 1/1 package/mpd: rebase init script on layout introduced by openssh
Rebase S95mpd on commit 1f743f4 (package/openssh: tidy up init script)
$ utils/check-package package/mpd/S95mpd 61 lines processed 0 warnings generated
--- package/mpd/S95mpd | 64 +++++++++++++++++++++++++++++++++------------- 1 file changed, 46 insertions(+), 18 deletions(-)
package/mpd/S95mpd +46 -18
@@ -1,33 +1,61 @@ #!/bin/sh +# +# S95mpd Starts Music Player daemon. +# +# shellcheck disable=SC2317 # functions are called via variable + +DAEMON="mpd" +PIDFILE="/var/run/$DAEMON.pid" # Sanity checks -test -f /etc/mpd.conf || exit 0 +[ -f /etc/$DAEMON.conf ] || exit 0 start() { - printf "Starting mpd: " - start-stop-daemon --start --quiet --background --exec /usr/bin/mpd \ - && echo "OK" || echo "FAIL" + printf "Starting %s: " "$DAEMON" + # $DAEMON creates its own $PIDFILE, so do not use --pidfile + start-stop-daemon --start --exec "/usr/bin/$DAEMON" + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi + return "$status" } stop() { - printf "Stopping mpd: " - start-stop-daemon --stop --quiet --pidfile /var/run/mpd.pid \ - && echo "OK" || echo "FAIL" + printf "Stopping %s: " "$DAEMON" + start-stop-daemon --stop --pidfile "$PIDFILE" \ + --exec "/usr/bin/$DAEMON" + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi + # $DAEMON deletes its PID file on exit, wait for it to be gone + while [ -f "$PIDFILE" ]; do + sleep 0.1 + done + return "$status" +} + +restart() { + stop + start +} + +reload() { + restart } case "$1" in - start) - start - ;; - stop) - stop - ;; - restart|reload) - stop - sleep 1 - start + start|stop|reload|restart) + "$1" ;; *) - echo "Usage: $0 {start|stop|restart}" + echo "Usage: $0 {start|stop|reload|restart}" exit 1 esac + +exit $?
Signature · 6 lines
2.43.0 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Hello Andreas,
package/mpd/S95mpd line 15
Quoted 2 lines · On Sun, 21 Jul 2024 08:57:37 +0200 Andreas Ziegler <[email protected]> wrote:
package/mpd/S95mpd +2
-0+ printf "Starting %s: " "$DAEMON" + # $DAEMON creates its own $PIDFILE, so do not use --pidfile
Not correct: you still need to use --pidfile. --pidfile does not tell start-stop-daemon to create the PID file, but it will check whether the process really created it.
OpenSSH also creates its own PID file, so could you rework to really follow the S50sshd example?
Thanks a lot!
Thomas
Signature · 7 lines
Thomas Petazzoni, co-owner and CEO, Bootlin Embedded Linux and Kernel engineering and training https://bootlin.com _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
PATCH v2 1/1 package/mpd: rebase init script on layout introduced by openssh
Rebase S95mpd on commit 1f743f4 (package/openssh: tidy up init script)
$ utils/check-package package/mpd/S95mpd 61 lines processed 0 warnings generated
(smoke test on live system)
---
Changes v1 -> v2
- use --pidfile in startup of service [Thomas Petazzoni]
package/mpd/S95mpd | 64 +++++++++++++++++++++++++++++++++------------- 1 file changed, 46 insertions(+), 18 deletions(-)
package/mpd/S95mpd +46 -18
@@ -1,33 +1,61 @@ #!/bin/sh +# +# S95mpd Starts Music Player daemon. +# +# shellcheck disable=SC2317 # functions are called via variable + +DAEMON="mpd" +PIDFILE="/var/run/$DAEMON.pid" # Sanity checks -test -f /etc/mpd.conf || exit 0 +[ -f /etc/$DAEMON.conf ] || exit 0 start() { - printf "Starting mpd: " - start-stop-daemon --start --quiet --background --exec /usr/bin/mpd \ - && echo "OK" || echo "FAIL" + printf "Starting %s: " "$DAEMON" + start-stop-daemon --start --pidfile "$PIDFILE" \ + --exec "/usr/bin/$DAEMON" + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi + return "$status" } stop() { - printf "Stopping mpd: " - start-stop-daemon --stop --quiet --pidfile /var/run/mpd.pid \ - && echo "OK" || echo "FAIL" + printf "Stopping %s: " "$DAEMON" + start-stop-daemon --stop --pidfile "$PIDFILE" \ + --exec "/usr/bin/$DAEMON" + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi + # $DAEMON deletes its PID file on exit, wait for it to be gone + while [ -f "$PIDFILE" ]; do + sleep 0.1 + done + return "$status" +} + +restart() { + stop + start +} + +reload() { + restart } case "$1" in - start) - start - ;; - stop) - stop - ;; - restart|reload) - stop - sleep 1 - start + start|stop|reload|restart) + "$1" ;; *) - echo "Usage: $0 {start|stop|restart}" + echo "Usage: $0 {start|stop|reload|restart}" exit 1 esac + +exit $?
Signature · 6 lines
2.43.0 _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot
Thomas Petazzoni via buildroot
AppliedQuoted 6 lines · On Sun, 21 Jul 2024 19:36:04 +0200 Andreas Ziegler <[email protected]> wrote:
Rebase S95mpd on commit 1f743f4 (package/openssh: tidy up init script)
$ utils/check-package package/mpd/S95mpd 61 lines processed 0 warnings generated
Quoted 6 lines
(smoke test on live system)
Signed-off-by Andreas Ziegler <[email protected]>---
Changes v1 -> v2
- use --pidfile in startup of service [Thomas Petazzoni]
Applied to master, thanks.
Thomas
Signature · 7 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com _______________________________________________ buildroot mailing list [email protected] https://lists.buildroot.org/mailman/listinfo/buildroot