diff options
| author | Laurent Bercot <ska-adelie@skarnet.org> | 2018-08-14 19:52:39 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska-adelie@skarnet.org> | 2018-08-15 15:12:16 +0000 |
| commit | afb0fe3ccead10a3a68f938e80c891fe9d9cb9d3 (patch) | |
| tree | b5809b8e852347718303fa2c93a5bc0c2eb07bfc /system/sysvinit | |
| parent | cdbdb41c2da9c3185122be33fdef720f7d9f0883 (diff) | |
| download | packages-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/sysvinit')
| -rw-r--r-- | system/sysvinit/APKBUILD | 6 | ||||
| -rw-r--r-- | system/sysvinit/inittab-2.88 | 15 |
2 files changed, 6 insertions, 15 deletions
diff --git a/system/sysvinit/APKBUILD b/system/sysvinit/APKBUILD index 184b330cf..7b0b0cee5 100644 --- a/system/sysvinit/APKBUILD +++ b/system/sysvinit/APKBUILD @@ -2,12 +2,12 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=sysvinit pkgver=2.88 -pkgrel=4 +pkgrel=5 pkgdesc="System V-style init programs" url="https://savannah.nongnu.org/projects/sysvinit" arch="all" license="GPL-2.0+" -depends="" +depends="s6" makedepends="linux-headers utmps-dev" install="sysvinit.post-upgrade" options="!check" @@ -57,6 +57,6 @@ package() { } sha512sums="0bd8eeb124e84fdfa8e621b05f796804ee69a9076b65f5115826bfa814ac1d5d28d31a5c22ebe77c86a93b2288edf4891adc0afaecc4de656c4ecda8a83807bf sysvinit-2.88dsf.tar.bz2 -3866d377873b44fb7675b9f05e28190b99b7fedddd9463a0bf41de6ff7cad90e0a4273a9908b1f5c77abea85aa867e2f20ce4d466ce97607863cd9b122f8e9b0 inittab-2.88 +52d301225bf0cb0c4d124d205cf3a1e1f4eca21a69179da4882359f79606562354fddf887da8203129bede1d073efa9cdd8fe84a327b51229248b22240b9d5dd inittab-2.88 27dfe089660a291cbcba06d8564bad11f7fd7c96629e72c2b005562689dc7d8bb479c760e980590906e98423b991ae0acd048713d3bc372174d55ed894abeb3f sysvinit-2.88-posix-header.patch 3605f88ac3faf7d12bf2269ca5d8625850d53e8583b573ab280fa17066c8e4e5217a0d17b94e47ea67a153ad3b88b433471a77544bd085f01f7d9d353ac16aae utmpx.patch" diff --git a/system/sysvinit/inittab-2.88 b/system/sysvinit/inittab-2.88 index 1f0b5eb98..e96205a06 100644 --- a/system/sysvinit/inittab-2.88 +++ b/system/sysvinit/inittab-2.88 @@ -10,6 +10,7 @@ # Modified by: Robin H. Johnson, <robbat2@gentoo.org> # Modified by: William Hubbs, <williamh@gentoo.org> # Modified by: A. Wilcox, <awilfox@adelielinux.org> +# Modified by: Laurent Bercot, <ska-adelie@skarnet.org> # # Default runlevel. @@ -36,18 +37,8 @@ l6r:6:wait:/sbin/reboot -fin su0:S:wait:/sbin/openrc single su1:S:wait:/sbin/sulogin -# TERMINALS -#x1:12345:respawn:/sbin/agetty 38400 console linux -c1:12345:respawn:/sbin/agetty 38400 tty1 linux -c2:2345:respawn:/sbin/agetty 38400 tty2 linux -c3:2345:respawn:/sbin/agetty 38400 tty3 linux -c4:2345:respawn:/sbin/agetty 38400 tty4 linux -c5:2345:respawn:/sbin/agetty 38400 tty5 linux -c6:2345:respawn:/sbin/agetty 38400 tty6 linux - -# SERIAL CONSOLES -#s0:12345:respawn:/sbin/agetty -L 9600 ttyS0 vt100 -#s1:12345:respawn:/sbin/agetty -L 9600 ttyS1 vt100 +# We now delegate all "respawn" services, including terminals, to s6. +s6:12345:respawn:/lib/s6/s6-svscanboot # What to do at the "Three Finger Salute". ca:12345:ctrlaltdel:/sbin/shutdown -r now |