From 6e6afa1b5056cc8ae7e40c4a3f58bb6868eda821 Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Tue, 18 Nov 2025 09:20:46 +0100 Subject: [PATCH] s6-svscanboot: launch s6-svscan with notify=fd:4 Now that the bug that made it fail is fixed, use the start-stop-daemon readiness notification mechanism when launching s6-svscan. (We do not run s6-svscan under supervise-daemon because that would needlessly lengthen the supervision chain. Yo dawg, we heard you like supervisors.) --- init.d/s6-svscan.in | 2 +- sh/s6-svscanboot.sh.in | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/init.d/s6-svscan.in b/init.d/s6-svscan.in index 8d1499d1..f16bffbb 100644 --- a/init.d/s6-svscan.in +++ b/init.d/s6-svscan.in @@ -18,7 +18,7 @@ command_args="$RC_SVCDIR" command_background=yes pidfile=/var/run/s6-svscan.pid umask=022 -# notify=fd:4 # when notify=fd is fixed, uncomment here and add -d4 in svscanboot +notify=fd:4 depend() { need localmount diff --git a/sh/s6-svscanboot.sh.in b/sh/s6-svscanboot.sh.in index af824a19..c18e75df 100644 --- a/sh/s6-svscanboot.sh.in +++ b/sh/s6-svscanboot.sh.in @@ -17,7 +17,6 @@ s6-log -bpd3 -- t s1048576 n10 "$logdir" EOF chmod 0755 "$scandir/s6-svscan-log/run" -# when notify=fd is fixed, add -d4 after -X3 exec redirfd -wnb 1 "$scandir/s6-svscan-log/fifo" \ fdmove -c 2 1 \ -s6-svscan -X3 -- "$scandir" 0/dev/console +s6-svscan -X3 -d4 -- "$scandir" 0/dev/console