main/mqtt-exec: initd use supervise-daemon

1 files changed, 11 insertions, 14 deletions

diff --git a/main/mqtt-exec/mqtt-exec.initd b/main/mqtt-exec/mqtt-exec.initd
index 4b6b2c9627..92a64d8fb3 100644
--- a/main/mqtt-exec/mqtt-exec.initd
+++ b/main/mqtt-exec/mqtt-exec.initd
@@ -2,22 +2,24 @@
 
 : ${mqtt_broker:="msg.alpinelinux.org"}
 : ${mqtt_topics:="git/aports/$git_branch"}
-: ${exec_user:=nobody}
+: ${command_user:=nobody}
 
 command=/usr/bin/mqtt-exec
-pidfile=/var/run/$SVCNAME/mqtt-exec.pid
+pidfile=/run/$SVCNAME/mqtt-exec.pid
+supervisor=supervise-daemon
+supervise_daemon_args="--stdout /dev/null --stderr /dev/null"
 
 depend() {
 	need localmount net
 	after firewall
 }
 
-start() {
-	local topic
+start_pre() {
 	checkpath --directory --owner ${exec_user:-nobody} ${pidfile%/*}
+
 	set -- $command_args -h ${mqtt_broker} -v
-	for topic in $mqtt_topics; do
-		set -- "$@" -t "$topic"
+	local topic; for topic in $mqtt_topics; do
+		 set -- "$@" -t "$topic"
 	done
 
 	if [ -n "$will_topic" ]; then
@@ -33,13 +35,8 @@ start() {
 		set -- "$@" --will-qos "$will_qos"
 	fi
 
-	ebegin "Starting $SVCNAME"
-	start-stop-daemon --start --stdout /dev/null --stderr /dev/null \
-		--background --make-pid --user ${exec_user} \
-		--pidfile ${pidfile} \
-		--exec $command \
-		-- "$@" \
-		-- ${exec_command}
-	eend
+	set -- "$@" -- ${exec_command}
+
+	command_args="$@"
 }