From af8d6b1a7bda632258985a574f14e32a761b39ce Mon Sep 17 00:00:00 2001
From: =?utf8?q?Hendrik=20J=C3=A4ger?= <gitcommit@henk.geekmail.org>
Date: Thu, 2 Nov 2023 13:42:27 +0100
Subject: [PATCH] fix: simplify startup script

---
 files/etc/init.d/s6               |  5 ++++
 files/usr/local/bin/s6-svscanboot | 39 ++++---------------------------
 2 files changed, 9 insertions(+), 35 deletions(-)

diff --git a/files/etc/init.d/s6 b/files/etc/init.d/s6
index 29bf0e2..f99e11d 100644
--- a/files/etc/init.d/s6
+++ b/files/etc/init.d/s6
@@ -35,6 +35,9 @@ case "$1" in
 			/sbin/start-stop-daemon \
 				--start \
 				--oknodo \
+				--make-pidfile \
+				--pidfile /run/s6-svscan.pid \
+				--background \
 				--chdir "${SCANDIR}" \
 				--exec "${DAEMON}" \
 				-- "${DAEMON_ARGS}"
@@ -48,6 +51,8 @@ case "$1" in
 			/sbin/start-stop-daemon \
 				--stop \
 				--oknodo \
+				--remove-pidfile \
+				--pidfile /run/s6-svscan.pid \
 				--retry TERM/60/KILL/10 \
 				--exec /usr/bin/s6-svscan
 			/sbin/start-stop-daemon \
diff --git a/files/usr/local/bin/s6-svscanboot b/files/usr/local/bin/s6-svscanboot
index aca8577..356b4eb 100644
--- a/files/usr/local/bin/s6-svscanboot
+++ b/files/usr/local/bin/s6-svscanboot
@@ -1,40 +1,9 @@
 #!/bin/execlineb -S1
 
-foreground { redirfd -w 2 /dev/null mkdir -p /run/uncaught-logs }
-if { chown s6-logs:s6-logs /run/uncaught-logs }
-if { chmod 2700 /run/uncaught-logs }
-foreground { redirfd -w 2 /dev/null mkdir -p ${1}/.s6-svscan ${1}/s6-svscan-log }
-foreground { redirfd -w 2 /dev/null ln -sf /bin/false ${1}/.s6-svscan/crash }
-if
+pipeline -w
 {
-  redirfd -w 1 ${1}/.s6-svscan/finish
-  heredoc 0 "#!/bin/execlineb -P\ns6-svc -x -- \"${1}/s6-svscan-log\"\n"
-  cat
+	/usr/bin/logger -t s6
 }
-if { chmod 0755 ${1}/.s6-svscan/finish }
-foreground { redirfd -w 2 /dev/null mkfifo -m 0600 ${1}/s6-svscan-log/fifo }
-if
-{
-  redirfd -w 1 ${1}/s6-svscan-log/run
-  heredoc 0 "#!/bin/execlineb -P
-redirfd -w 2 /dev/console
-redirfd -rnb 0 fifo
-s6-setuidgid s6-logs
-exec -c
-s6-log t T /run/uncaught-logs\n"
-  cat
-}
-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
-piperw 3 4
-background {
-	fdclose 3
-	s6-setsid
-	s6-svscan -d4 -- ${1}
-}
-fdclose 4
-fdmove 1 3
-head -n 1
+redirfd -r 0 /dev/null
+/usr/bin/s6-svscan $1
-- 
2.39.2