summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaurent Bercot <ska-adelie@skarnet.org>2019-02-04 22:06:34 +0000
committerLaurent Bercot <ska-adelie@skarnet.org>2019-02-04 22:06:34 +0000
commitbf2e28b887e839cb06779175ed32cd349c25d64a (patch)
tree7ec206927e176fe76e096eeff44a54e05e0603b6
parentee482f601f46581e1b3be881e06e0f7495c67acf (diff)
parente72f41087521796b0711429b6b60ec2be3dae989 (diff)
downloadpackages-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
-rw-r--r--system/s6/APKBUILD6
-rw-r--r--system/s6/s6-svscanboot9
2 files changed, 10 insertions, 5 deletions
diff --git a/system/s6/APKBUILD b/system/s6/APKBUILD
index dd8c20f8b..5c7ec31a1 100644
--- a/system/s6/APKBUILD
+++ b/system/s6/APKBUILD
@@ -1,7 +1,7 @@
# Contributor: Laurent Bercot <ska-adelie@skarnet.org>
# Maintainer: Laurent Bercot <ska-adelie@skarnet.org>
pkgname=s6
-pkgver=2.7.2.1
+pkgver=2.7.2.2
pkgrel=0
pkgdesc="skarnet.org's small & secure supervision software suite"
url="https://skarnet.org/software/$pkgname/"
@@ -42,5 +42,5 @@ doc() {
cp -a "$builddir/doc" "$subpkgdir/usr/share/doc/$pkgname"
}
-sha512sums="dcf032b812ce955c2276af36aa93138debcfa9e429e79af7b8da4f1e98b21e7b658564024c713fef45ffee03704d78f7618ad4b890de0bd3defa51b4689d3790 s6-2.7.2.1.tar.gz
-bad19965aa8ea138cdf5688db9ae05fc7ce2111ac0945b5b0e78cda55ad290602f28ac8b52aae395ca5e857f32e9be4d6df882286b362ba7008a52b29472ff1e s6-svscanboot"
+sha512sums="ed7b9fbc73e9947e56ad641459c04ff210fb801c8cfdbb5f0a00bdecbe1f5969ae73a6b52b048cd6617c88308f3a7bfd0ed98a48e78b1b5ba90b96e95845d165 s6-2.7.2.2.tar.gz
+9c29bc9eee6d5ab502a5a86bb043ebd21e085022efc506a330ae5ab0eadf7038d0a3dc8e025d78d9610cf7ec0ca031887f755486c4cb4e571090ea3a9c1806ac 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