summaryrefslogtreecommitdiff
path: root/system/s6/s6.initd
diff options
context:
space:
mode:
authorLaurent Bercot <ska-adelie@skarnet.org>2018-08-14 19:52:39 +0000
committerLaurent Bercot <ska-adelie@skarnet.org>2018-08-15 15:12:16 +0000
commitafb0fe3ccead10a3a68f938e80c891fe9d9cb9d3 (patch)
treeb5809b8e852347718303fa2c93a5bc0c2eb07bfc /system/s6/s6.initd
parentcdbdb41c2da9c3185122be33fdef720f7d9f0883 (diff)
downloadpackages-afb0fe3ccead10a3a68f938e80c891fe9d9cb9d3.tar.gz
packages-afb0fe3ccead10a3a68f938e80c891fe9d9cb9d3.tar.bz2
packages-afb0fe3ccead10a3a68f938e80c891fe9d9cb9d3.tar.xz
packages-afb0fe3ccead10a3a68f938e80c891fe9d9cb9d3.zip
Move s6 higher in the supervision chain
- Better s6 layout, with a place for early services and a place for packages to add their services later on. - s6-svscan is now supervised by sysvinit (instead of being run once by openrc) - s6-svscan is now the only process supervised by sysvinit. All the other "respawn" lines are delegated to s6. - utmpd and wtmpd are now early services instead of being added by openrc. These changes implement a full supervision architecture and make init more flexible. Later on, it will be easier to - add conditional gettys (for /dev/hvc0...) - remove sysvinit entirely - decouple the init process from the service manager.
Diffstat (limited to 'system/s6/s6.initd')
-rw-r--r--system/s6/s6.initd15
1 files changed, 0 insertions, 15 deletions
diff --git a/system/s6/s6.initd b/system/s6/s6.initd
deleted file mode 100644
index 9f984cc13..000000000
--- a/system/s6/s6.initd
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 2016 Laurent Bercot
-# Distributed under the terms of the ISC License.
-#
-# We currently start the supervision tree under OpenRC because
-# it's easy integration. It's not perfect: the supervision tree
-# should ideally be rooted in process 1, and here it's not.
-# But it's only temporary: in a later Alpine release, s6-svscan
-# will *be* process 1.
-
-name="s6"
-command="/lib/s6/s6-svscanboot"
-command_args="/run/service"
-pidfile="/run/s6.pid"
-start_stop_daemon_args="-b -m -k 022"