From: Hendrik Jäger <gitcommit@henk.geekmail.org>
Date: Sun, 22 May 2022 13:36:47 +0000 (+0200)
Subject: fix: wait until s6-svscan is ready
X-Git-Url: https://git.netwichtig.de/gitweb/?a=commitdiff_plain;h=cdf99a6c762c799eb1c71385391813f804096328;p=user%2Fhenk%2Fcode%2Fpuppet%2Fmodules%2Fs6.git

fix: wait until s6-svscan is ready
---

diff --git a/files/etc/init.d/s6 b/files/etc/init.d/s6
index a307908..371e53e 100644
--- a/files/etc/init.d/s6
+++ b/files/etc/init.d/s6
@@ -15,7 +15,6 @@ DESC="s6 system service supervision suite"
 DAEMON="/usr/local/bin/s6-svscanboot"
 SCANDIR="/etc/s6-scandir/"
 DAEMON_ARGS=${SCANDIR}
-PIDFILE="/var/run/s6.pid"
 SCRIPTNAME="/etc/init.d/${NAME}"
 
 test -x $DAEMON || exit 0
@@ -37,23 +36,15 @@ case "$1" in
 				--start \
 				--oknodo \
 				--chdir "${SCANDIR}" \
-				--startas "${DAEMON}" \
-				--background \
-				--make-pidfile \
-				--pidfile "${PIDFILE}" \
+				--exec "${DAEMON}" \
 				-- "${DAEMON_ARGS}"
 			log_end_msg $?
 		fi
 		;;
 	stop)
 		log_daemon_msg "Stopping ${DESC}" "${NAME}"
-		/sbin/start-stop-daemon \
-			--stop \
-			--oknodo \
-			--retry TERM/60/QUIT/60 \
-			--remove-pidfile \
-			--pidfile "${PIDFILE}"
-		if test $? = 2; then
+		/usr/bin/s6-svscanctl -t "${SCANDIR}"
+		if test $? = 111; then
 			/sbin/start-stop-daemon \
 				--stop \
 				--oknodo \
@@ -72,7 +63,7 @@ case "$1" in
 		$0 start
 		;;
 	status)
-		status_of_proc -p ${PIDFILE} ${DAEMON} s6 && exit 0 || exit $?
+		status_of_proc ${DAEMON} s6 && exit 0 || exit $?
 		;;
 	*)
 		echo "Usage: ${SCRIPTNAME} {start|stop|restart|force-reload|status}"
diff --git a/files/usr/local/bin/s6-svscanboot b/files/usr/local/bin/s6-svscanboot
index 7a5f549..f2b6e35 100644
--- a/files/usr/local/bin/s6-svscanboot
+++ b/files/usr/local/bin/s6-svscanboot
@@ -29,5 +29,12 @@ if { chmod 0755 ${1}/s6-svscan-log/run }
 redirfd -r 0 /dev/null
 redirfd -wnb 1 ${1}/s6-svscan-log/fifo
 fdmove -c 2 1
-s6-svscan -- ${1}
-
+piperw 3 4
+background {
+	fdclose 3
+	s6-setsid
+	s6-svscan -d4 -- ${1}
+}
+fdclose 4
+fdmove 1 3
+head -n 1
diff --git a/files/usr/local/bin/s6-svscanboot.buster b/files/usr/local/bin/s6-svscanboot.buster
index ef6de1b..28aa5a1 100644
--- a/files/usr/local/bin/s6-svscanboot.buster
+++ b/files/usr/local/bin/s6-svscanboot.buster
@@ -29,5 +29,12 @@ if { chmod 0755 ${1}/s6-svscan-log/run }
 redirfd -r 0 /dev/null
 redirfd -wnb 1 ${1}/s6-svscan-log/fifo
 fdmove -c 2 1
-s6-svscan -- ${1}
-
+piperw 3 4
+background {
+	fdclose 3
+	s6-setsid
+	s6-svscan -d4 -- ${1}
+}
+fdclose 4
+fdmove 1 3
+head -n 1