summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLaurent Bercot <ska-adelie@skarnet.org>2018-08-19 14:47:01 +0000
committerLaurent Bercot <ska-adelie@skarnet.org>2018-08-19 20:11:37 +0000
commitcb085205ea9982a9857c0d06967314c29b17e811 (patch)
tree728d8a6293fafe8f35bd03d0539d3e7a8faac156
parentde8784d523b8002d3bbbc9527e1024736de680c3 (diff)
downloadpackages-cb085205ea9982a9857c0d06967314c29b17e811.tar.gz
packages-cb085205ea9982a9857c0d06967314c29b17e811.tar.bz2
packages-cb085205ea9982a9857c0d06967314c29b17e811.tar.xz
packages-cb085205ea9982a9857c0d06967314c29b17e811.zip
system/s6: allow openrc's sysinit to define early services
-rw-r--r--system/s6/APKBUILD4
-rw-r--r--system/s6/s6-svscanboot11
2 files changed, 13 insertions, 2 deletions
diff --git a/system/s6/APKBUILD b/system/s6/APKBUILD
index 546c50f16..a08220a3e 100644
--- a/system/s6/APKBUILD
+++ b/system/s6/APKBUILD
@@ -2,7 +2,7 @@
# Maintainer: Laurent Bercot <ska-adelie@skarnet.org>
pkgname=s6
pkgver=2.7.2.0
-pkgrel=1
+pkgrel=2
pkgdesc="skarnet.org's small & secure supervision software suite"
url="https://skarnet.org/software/$pkgname/"
arch="all"
@@ -53,5 +53,5 @@ doc() {
}
sha512sums="0ab98c44324054effa0754efd117b3126a53fac7096979aacffd7d86128c5cb1f714205e30ca4e561ca3740646d1f36eb53b9e30d139d7ce4dc1b8cfb3e33123 s6-2.7.2.0.tar.gz
-b4919f76498f86257e13210010a84284dd8574db062b96bcc527c0c5dcc2a35716ff0f3c4d23cb3ec7eed416f16aeec31247b1fda3bd06c1a8f6fd65cf32c6da s6-svscanboot
+bad19965aa8ea138cdf5688db9ae05fc7ce2111ac0945b5b0e78cda55ad290602f28ac8b52aae395ca5e857f32e9be4d6df882286b362ba7008a52b29472ff1e s6-svscanboot
fb60b841da03583ba9f0f0541b45e4cf88fa5311b26376042e951317428dcaa6c81bb6c739c7a442ef0d36e1581a29cb9c4fb2d87411268fb23a033130fc8051 agetty-run"
diff --git a/system/s6/s6-svscanboot b/system/s6/s6-svscanboot
index 447a1a01b..8fa8ec5d5 100644
--- a/system/s6/s6-svscanboot
+++ b/system/s6/s6-svscanboot
@@ -40,6 +40,17 @@ if
}
+# Also link the early services defined in sysinit, if any
+
+if
+{
+ if -t { test -d /run/early-services }
+ forbacktickx -pnd"\n" i { ls -1 -U /run/early-services }
+ importas -u i i
+ ln -nsf ../early-services/$i /run/service/$i
+}
+
+
# Create the catch-all logger servicedir directly in the scandir
# (It's too fundamental to be made configurable as an early service.)