From e72f41087521796b0711429b6b60ec2be3dae989 Mon Sep 17 00:00:00 2001 From: Luis Ressel Date: Tue, 29 Jan 2019 11:56:12 +0100 Subject: system/s6: Bump to 2.7.2.2, fix s6-svscanboot crash handler --- system/s6/s6-svscanboot | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) (limited to 'system/s6/s6-svscanboot') diff --git a/system/s6/s6-svscanboot b/system/s6/s6-svscanboot index 8fa8ec5d5..32eb5f290 100644 --- a/system/s6/s6-svscanboot +++ b/system/s6/s6-svscanboot @@ -12,14 +12,19 @@ umask 022 if { rm -rf /run/service /run/services } if { mkdir -p -m 0755 /run/service/.s6-svscan /run/service/s6-svscan-log } -if { ln -sf /bin/false /run/service/.s6-svscan/crash } +if +{ + redirfd -w 1 /run/service/.s6-svscan/crash + heredoc 0 "#!/bin/execlineb -P\nfalse\n" + cat +} if { redirfd -w 1 /run/service/.s6-svscan/finish heredoc 0 "#!/bin/execlineb -P\ns6-svc -X -- \"/run/service/s6-svscan-log\"\n" cat } -if { chmod 0755 /run/service/.s6-svscan/finish } +if { cd /run/service/.s6-svscan chmod 0755 crash finish } # Directory for the catch-all logger to store its logs -- cgit v1.2.3-60-g2f50