package/domoticz: rewrite init script
PATCH 1/1 package/domoticz: rewrite init script
Follow new S02klogd template
Signed-off-by Fabrice Fontaine <[email protected]>
--- package/domoticz/S99domoticz | 61 ++++++++++++++++++++++-------------- 1 file changed, 37 insertions(+), 24 deletions(-)
package/domoticz/S99domoticz +37 -24
@@ -1,38 +1,51 @@ #!/bin/sh -NAME=domoticz -PIDFILE=/var/run/$NAME.pid -DAEMON=/opt/domoticz/$NAME -DAEMON_ARGS="-daemon -www 8080 -sslwww 443" +DAEMON="domoticz" +PIDFILE="/var/run/$DAEMON.pid" + +DOMOTICZ_ARGS="-daemon -www 8080 -sslwww 443" + +[ -r "/etc/default/$DAEMON" ] && . "/etc/default/$DAEMON" start() { - printf "Starting $NAME: " - start-stop-daemon -S -q -m -b -p $PIDFILE --exec $DAEMON -- $DAEMON_ARGS - [ $? = 0 ] && echo "OK" || echo "FAIL" + printf 'Starting %s: ' "$DAEMON" + start-stop-daemon -b -m -S -q -p "$PIDFILE" -x "/opt/domoticz/$DAEMON" \ + -- $DOMOTICZ_ARGS + status=$? + if [ "$status" -eq 0 ]; then + echo "OK" + else + echo "FAIL" + fi + return "$status" } + stop() { - printf "Stopping $NAME: " - start-stop-daemon -K -q -p $PIDFILE - [ $? = 0 ] && echo "OK" || echo "FAIL" + 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) - start - ;; - stop) - stop - ;; - restart|reload) - restart - ;; - *) - echo "Usage: $0 {start|stop|restart}" - 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 $?
Signature · 1 line
2.20.1
Thomas Petazzoni
AppliedPATCH 1/1 package/domoticz: rewrite init script
Quoted 6 lines · On Thu, 18 Apr 2019 15:19:56 +0200 Fabrice Fontaine…
Follow new S02klogd template
Signed-off-by Fabrice Fontaine <[email protected]>--- package/domoticz/S99domoticz | 61 ++++++++++++++++++++++-------------- 1 file changed, 37 insertions(+), 24 deletions(-)
Applied to master, thanks.
Thomas
Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin Embedded Linux and Kernel engineering https://bootlin.com