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/inittab-2.88 | |
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/inittab-2.88')
-rw-r--r-- | system/sysvinit/inittab-2.88 | 15 |
1 files changed, 3 insertions, 12 deletions
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 |