From 7bd456ed7bf35da2d7a53650baa33637e178064e Mon Sep 17 00:00:00 2001 From: Mike Gilbert Date: Tue, 28 Apr 2015 21:03:49 -0400 Subject: [PATCH] Disable service scripts for systemd-nspawn This adds the -systemd-nspawn keyword to service scripts which are not intended to run in systemd-nspawn containers. This fixes #52. X-Gentoo-Bug: 548058 X-Gentoo-Bug-URL: https://bugs.gentoo.org/show_bug.cgi?id=548058 --- init.d/binfmt.in | 2 +- init.d/consolefont.in | 2 +- init.d/devfs.in | 2 +- init.d/dmesg.in | 2 +- init.d/fsck.in | 2 +- init.d/hostname.in | 2 +- init.d/hwclock.in | 2 +- init.d/keymaps.in | 2 +- init.d/localmount.in | 2 +- init.d/loopback.in | 2 +- init.d/modules.in | 2 +- init.d/mount-ro.in | 2 +- init.d/mtab.in | 2 +- init.d/netmount.in | 2 +- init.d/numlock.in | 2 +- init.d/procfs.in | 2 +- init.d/root.in | 2 +- init.d/swap.in | 2 +- init.d/swapfiles.in | 2 +- init.d/swclock.in | 2 +- init.d/sysctl.Linux.in | 2 +- init.d/sysfs.in | 2 +- init.d/termencoding.in | 2 +- init.d/urandom.in | 2 +- 24 files changed, 24 insertions(+), 24 deletions(-) diff --git a/init.d/binfmt.in b/init.d/binfmt.in index 651b1315..7de9aa5b 100644 --- a/init.d/binfmt.in +++ b/init.d/binfmt.in @@ -8,7 +8,7 @@ depend() { after procfs use modules devfs - keyword -openvz -prefix -vserver -lxc + keyword -openvz -prefix -systemd-nspawn -vserver -lxc } start() diff --git a/init.d/consolefont.in b/init.d/consolefont.in index 7ec93d66..e56cc095 100644 --- a/init.d/consolefont.in +++ b/init.d/consolefont.in @@ -8,7 +8,7 @@ depend() { need localmount termencoding after hotplug bootmisc - keyword -openvz -prefix -uml -vserver -xenu -lxc + keyword -openvz -prefix -systemd-nspawn -uml -vserver -xenu -lxc } start() diff --git a/init.d/devfs.in b/init.d/devfs.in index 5af68f91..86bda240 100644 --- a/init.d/devfs.in +++ b/init.d/devfs.in @@ -8,7 +8,7 @@ depend() { provide dev-mount before dev - keyword -prefix -vserver -lxc + keyword -prefix -systemd-nspawn -vserver -lxc } mount_dev() diff --git a/init.d/dmesg.in b/init.d/dmesg.in index 5b001fca..6e1ae532 100644 --- a/init.d/dmesg.in +++ b/init.d/dmesg.in @@ -7,7 +7,7 @@ description="Set the dmesg level for a cleaner boot" depend() { before dev modules - keyword -lxc -prefix -vserver + keyword -lxc -prefix -systemd-nspawn -vserver } start() diff --git a/init.d/fsck.in b/init.d/fsck.in index d3b66078..79e74e54 100644 --- a/init.d/fsck.in +++ b/init.d/fsck.in @@ -9,7 +9,7 @@ _IFS=" depend() { use dev clock modules - keyword -jail -openvz -prefix -timeout -vserver -lxc -uml + keyword -jail -openvz -prefix -systemd-nspawn -timeout -vserver -lxc -uml } _abort() { diff --git a/init.d/hostname.in b/init.d/hostname.in index eaeb79aa..5b8b75d6 100644 --- a/init.d/hostname.in +++ b/init.d/hostname.in @@ -5,7 +5,7 @@ description="Sets the hostname of the machine." depend() { - keyword -prefix -lxc + keyword -prefix -systemd-nspawn -lxc } start() diff --git a/init.d/hwclock.in b/init.d/hwclock.in index 4b0da02c..1dde2d63 100644 --- a/init.d/hwclock.in +++ b/init.d/hwclock.in @@ -28,7 +28,7 @@ depend() else before * fi - keyword -openvz -prefix -uml -vserver -xenu -lxc + keyword -openvz -prefix -systemd-nspawn -uml -vserver -xenu -lxc } setupopts() diff --git a/init.d/keymaps.in b/init.d/keymaps.in index eeed22a2..af424856 100644 --- a/init.d/keymaps.in +++ b/init.d/keymaps.in @@ -8,7 +8,7 @@ depend() { need localmount termencoding after bootmisc - keyword -openvz -prefix -uml -vserver -xenu -lxc + keyword -openvz -prefix -systemd-nspawn -uml -vserver -xenu -lxc } start() diff --git a/init.d/localmount.in b/init.d/localmount.in index 1335aa94..b2e8ef17 100644 --- a/init.d/localmount.in +++ b/init.d/localmount.in @@ -9,7 +9,7 @@ depend() need fsck use lvm modules mtab after lvm modules - keyword -jail -prefix -vserver -lxc + keyword -jail -prefix -systemd-nspawn -vserver -lxc } start() diff --git a/init.d/loopback.in b/init.d/loopback.in index ec45a98c..4602dd00 100644 --- a/init.d/loopback.in +++ b/init.d/loopback.in @@ -6,7 +6,7 @@ description="Configures the loopback interface." depend() { - keyword -jail -prefix -vserver + keyword -jail -prefix -systemd-nspawn -vserver } start() diff --git a/init.d/modules.in b/init.d/modules.in index acce97e3..e10e7ae2 100644 --- a/init.d/modules.in +++ b/init.d/modules.in @@ -7,7 +7,7 @@ description="Loads a user defined list of kernel modules." depend() { use isapnp - keyword -openvz -prefix -vserver -lxc + keyword -openvz -prefix -systemd-nspawn -vserver -lxc } start() diff --git a/init.d/mount-ro.in b/init.d/mount-ro.in index a6438b58..d3f7acc0 100644 --- a/init.d/mount-ro.in +++ b/init.d/mount-ro.in @@ -7,7 +7,7 @@ description="Re-mount filesytems read-only for a clean reboot." depend() { need killprocs savecache - keyword -openvz -prefix -vserver -lxc + keyword -openvz -prefix -systemd-nspawn -vserver -lxc } start() diff --git a/init.d/mtab.in b/init.d/mtab.in index 3ac39edc..51575b43 100644 --- a/init.d/mtab.in +++ b/init.d/mtab.in @@ -7,7 +7,7 @@ description="Update /etc/mtab to match what the kernel knows about" depend() { need root - keyword -prefix + keyword -prefix -systemd-nspawn } start() diff --git a/init.d/netmount.in b/init.d/netmount.in index 7c1b1229..66ba4090 100644 --- a/init.d/netmount.in +++ b/init.d/netmount.in @@ -9,7 +9,7 @@ depend() config /etc/fstab use afc-client amd nfsclient autofs openvpn use dns - keyword -jail -prefix -vserver -lxc + keyword -jail -prefix -systemd-nspawn -vserver -lxc } start() diff --git a/init.d/numlock.in b/init.d/numlock.in index 1b6d0a59..cdc0da01 100644 --- a/init.d/numlock.in +++ b/init.d/numlock.in @@ -9,7 +9,7 @@ ttyn=${rc_tty_number:-${RC_TTY_NUMBER:-12}} depend() { need localmount - keyword -openvz -prefix -vserver -lxc + keyword -openvz -prefix -systemd-nspawn -vserver -lxc } _setleds() diff --git a/init.d/procfs.in b/init.d/procfs.in index 167a1aa3..a9fcb9a2 100644 --- a/init.d/procfs.in +++ b/init.d/procfs.in @@ -8,7 +8,7 @@ depend() { use modules devfs need localmount - keyword -openvz -prefix -vserver -lxc + keyword -openvz -prefix -systemd-nspawn -vserver -lxc } start() diff --git a/init.d/root.in b/init.d/root.in index 1668368c..0395dd12 100644 --- a/init.d/root.in +++ b/init.d/root.in @@ -7,7 +7,7 @@ description="Mount the root fs read/write" depend() { need fsck - keyword -jail -openvz -prefix -vserver -lxc + keyword -jail -openvz -prefix -systemd-nspawn -vserver -lxc } start() diff --git a/init.d/swap.in b/init.d/swap.in index a64ea608..41d4eac8 100644 --- a/init.d/swap.in +++ b/init.d/swap.in @@ -5,7 +5,7 @@ depend() { before localmount - keyword -jail -openvz -prefix -vserver -lxc + keyword -jail -openvz -prefix -systemd-nspawn -vserver -lxc } start() diff --git a/init.d/swapfiles.in b/init.d/swapfiles.in index 1c805004..5c807626 100644 --- a/init.d/swapfiles.in +++ b/init.d/swapfiles.in @@ -5,7 +5,7 @@ depend() { need localmount - keyword -jail -openvz -prefix -vserver -lxc + keyword -jail -openvz -prefix -systemd-nspawn -vserver -lxc } start() diff --git a/init.d/swclock.in b/init.d/swclock.in index b74d49a1..b3ea17bd 100644 --- a/init.d/swclock.in +++ b/init.d/swclock.in @@ -8,7 +8,7 @@ depend() { before * provide clock - keyword -openvz -prefix -uml -vserver -xenu -lxc + keyword -openvz -prefix -systemd-nspawn -uml -vserver -xenu -lxc } # swclock is an OpenRC built in diff --git a/init.d/sysctl.Linux.in b/init.d/sysctl.Linux.in index 1defcec4..186c6eda 100644 --- a/init.d/sysctl.Linux.in +++ b/init.d/sysctl.Linux.in @@ -5,7 +5,7 @@ depend() { before bootmisc logger - keyword -prefix -vserver + keyword -prefix -systemd-nspawn -vserver } start() diff --git a/init.d/sysfs.in b/init.d/sysfs.in index 6e52a9d5..5641abe1 100644 --- a/init.d/sysfs.in +++ b/init.d/sysfs.in @@ -8,7 +8,7 @@ sysfs_opts=nodev,noexec,nosuid depend() { - keyword -lxc -prefix -vserver + keyword -lxc -prefix -systemd-nspawn -vserver } mount_sys() diff --git a/init.d/termencoding.in b/init.d/termencoding.in index d3aa0278..59ca6257 100644 --- a/init.d/termencoding.in +++ b/init.d/termencoding.in @@ -9,7 +9,7 @@ ttyn=${rc_tty_number:-${RC_TTY_NUMBER:-12}} depend() { - keyword -lxc -openvz -prefix -uml -vserver -xenu + keyword -lxc -openvz -prefix -systemd-nspawn -uml -vserver -xenu use root after bootmisc } diff --git a/init.d/urandom.in b/init.d/urandom.in index ded41137..0dd2ba65 100644 --- a/init.d/urandom.in +++ b/init.d/urandom.in @@ -8,7 +8,7 @@ description="Initializes the random number generator." depend() { need localmount - keyword -jail -lxc -openvz -prefix + keyword -jail -lxc -openvz -prefix -systemd-nspawn } save_seed()