Skip to content

Commit 6e6afa1

Browse files
Laurent Bercotnavi-desu
authored andcommitted
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.)
1 parent f09a15d commit 6e6afa1

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

init.d/s6-svscan.in

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ command_args="$RC_SVCDIR"
1818
command_background=yes
1919
pidfile=/var/run/s6-svscan.pid
2020
umask=022
21-
# notify=fd:4 # when notify=fd is fixed, uncomment here and add -d4 in svscanboot
21+
notify=fd:4
2222

2323
depend() {
2424
need localmount

sh/s6-svscanboot.sh.in

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,6 @@ s6-log -bpd3 -- t s1048576 n10 "$logdir"
1717
EOF
1818
chmod 0755 "$scandir/s6-svscan-log/run"
1919

20-
# when notify=fd is fixed, add -d4 after -X3
2120
exec redirfd -wnb 1 "$scandir/s6-svscan-log/fifo" \
2221
fdmove -c 2 1 \
23-
s6-svscan -X3 -- "$scandir" 0</dev/null 3>/dev/console
22+
s6-svscan -X3 -d4 -- "$scandir" 0</dev/null 3>/dev/console

0 commit comments

Comments
 (0)