diff options
| author | Laurent Bercot <ska-adelie@skarnet.org> | 2019-02-04 22:06:34 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska-adelie@skarnet.org> | 2019-02-04 22:06:34 +0000 |
| commit | bf2e28b887e839cb06779175ed32cd349c25d64a (patch) | |
| tree | 7ec206927e176fe76e096eeff44a54e05e0603b6 /system/s6/s6-svscanboot | |
| parent | ee482f601f46581e1b3be881e06e0f7495c67acf (diff) | |
| parent | e72f41087521796b0711429b6b60ec2be3dae989 (diff) | |
| download | packages-bf2e28b887e839cb06779175ed32cd349c25d64a.tar.gz packages-bf2e28b887e839cb06779175ed32cd349c25d64a.tar.bz2 packages-bf2e28b887e839cb06779175ed32cd349c25d64a.tar.xz packages-bf2e28b887e839cb06779175ed32cd349c25d64a.zip | |
Merge branch 's6' into 'master'
system/s6: Bump to 2.7.2.2, fix s6-svscanboot crash handler
See merge request !161
Diffstat (limited to 'system/s6/s6-svscanboot')
| -rw-r--r-- | system/s6/s6-svscanboot | 9 |
1 files changed, 7 insertions, 2 deletions
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 |