emo/openrc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Disable service scripts for systemd-nspawn

Browse Source 
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
This commit is contained in:
Mike Gilbert 2015-04-28 21:03:49 -04:00 committed by William Hubbs
parent c709e6077c
commit 7bd456ed7b
24 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
init.d/binfmt.in
View File

@ -8,7 +8,7 @@ depend()
{ {
after procfs after procfs
use modules devfs use modules devfs
keyword -openvz -prefix -vserver -lxc keyword -openvz -prefix -systemd-nspawn -vserver -lxc
} }
start() start()

2
init.d/consolefont.in
View File

@ -8,7 +8,7 @@ depend()
{ {
need localmount termencoding need localmount termencoding
after hotplug bootmisc after hotplug bootmisc
keyword -openvz -prefix -uml -vserver -xenu -lxc keyword -openvz -prefix -systemd-nspawn -uml -vserver -xenu -lxc
} }
start() start()

2
init.d/devfs.in
View File

@ -8,7 +8,7 @@ depend()
{ {
provide dev-mount provide dev-mount
before dev before dev
keyword -prefix -vserver -lxc keyword -prefix -systemd-nspawn -vserver -lxc
} }
mount_dev() mount_dev()

2
init.d/dmesg.in
View File

@ -7,7 +7,7 @@ description="Set the dmesg level for a cleaner boot"
depend() depend()
{ {
before dev modules before dev modules
keyword -lxc -prefix -vserver keyword -lxc -prefix -systemd-nspawn -vserver
} }
start() start()

2
init.d/fsck.in
View File

@ -9,7 +9,7 @@ _IFS="
depend() depend()
{ {
use dev clock modules use dev clock modules
keyword -jail -openvz -prefix -timeout -vserver -lxc -uml keyword -jail -openvz -prefix -systemd-nspawn -timeout -vserver -lxc -uml
} }
_abort() { _abort() {

2
init.d/hostname.in
View File

@ -5,7 +5,7 @@
description="Sets the hostname of the machine." description="Sets the hostname of the machine."
depend() { depend() {
keyword -prefix -lxc keyword -prefix -systemd-nspawn -lxc
} }
start() start()

2
init.d/hwclock.in
View File

@ -28,7 +28,7 @@ depend()
else else
before * before *
fi fi
keyword -openvz -prefix -uml -vserver -xenu -lxc keyword -openvz -prefix -systemd-nspawn -uml -vserver -xenu -lxc
} }
setupopts() setupopts()

2
init.d/keymaps.in
View File

@ -8,7 +8,7 @@ depend()
{ {
need localmount termencoding need localmount termencoding
after bootmisc after bootmisc
keyword -openvz -prefix -uml -vserver -xenu -lxc keyword -openvz -prefix -systemd-nspawn -uml -vserver -xenu -lxc
} }
start() start()

2
init.d/localmount.in
View File

@ -9,7 +9,7 @@ depend()
need fsck need fsck
use lvm modules mtab use lvm modules mtab
after lvm modules after lvm modules
keyword -jail -prefix -vserver -lxc keyword -jail -prefix -systemd-nspawn -vserver -lxc
} }
start() start()

2
init.d/loopback.in
View File

@ -6,7 +6,7 @@ description="Configures the loopback interface."
depend() depend()
{ {
keyword -jail -prefix -vserver keyword -jail -prefix -systemd-nspawn -vserver
} }
start() start()

2
init.d/modules.in
View File

@ -7,7 +7,7 @@ description="Loads a user defined list of kernel modules."
depend() depend()
{ {
use isapnp use isapnp
keyword -openvz -prefix -vserver -lxc keyword -openvz -prefix -systemd-nspawn -vserver -lxc
} }
start() start()

2
init.d/mount-ro.in
View File

@ -7,7 +7,7 @@ description="Re-mount filesytems read-only for a clean reboot."
depend() depend()
{ {
need killprocs savecache need killprocs savecache
keyword -openvz -prefix -vserver -lxc keyword -openvz -prefix -systemd-nspawn -vserver -lxc
} }
start() start()

2
init.d/mtab.in
View File

@ -7,7 +7,7 @@ description="Update /etc/mtab to match what the kernel knows about"
depend() depend()
{ {
need root need root
keyword -prefix keyword -prefix -systemd-nspawn
} }
start() start()

2
init.d/netmount.in
View File

@ -9,7 +9,7 @@ depend()
config /etc/fstab config /etc/fstab
use afc-client amd nfsclient autofs openvpn use afc-client amd nfsclient autofs openvpn
use dns use dns
keyword -jail -prefix -vserver -lxc keyword -jail -prefix -systemd-nspawn -vserver -lxc
} }
start() start()

2
init.d/numlock.in
View File

@ -9,7 +9,7 @@ ttyn=${rc_tty_number:-${RC_TTY_NUMBER:-12}}
depend() depend()
{ {
need localmount need localmount
keyword -openvz -prefix -vserver -lxc keyword -openvz -prefix -systemd-nspawn -vserver -lxc
} }
_setleds() _setleds()

2
init.d/procfs.in
View File

@ -8,7 +8,7 @@ depend()
{ {
use modules devfs use modules devfs
need localmount need localmount
keyword -openvz -prefix -vserver -lxc keyword -openvz -prefix -systemd-nspawn -vserver -lxc
} }
start() start()

2
init.d/root.in
View File

@ -7,7 +7,7 @@ description="Mount the root fs read/write"
depend() depend()
{ {
need fsck need fsck
keyword -jail -openvz -prefix -vserver -lxc keyword -jail -openvz -prefix -systemd-nspawn -vserver -lxc
} }
start() start()

2
init.d/swap.in
View File

@ -5,7 +5,7 @@
depend() depend()
{ {
before localmount before localmount
keyword -jail -openvz -prefix -vserver -lxc keyword -jail -openvz -prefix -systemd-nspawn -vserver -lxc
} }
start() start()

2
init.d/swapfiles.in
View File

@ -5,7 +5,7 @@
depend() depend()
{ {
need localmount need localmount
keyword -jail -openvz -prefix -vserver -lxc keyword -jail -openvz -prefix -systemd-nspawn -vserver -lxc
} }
start() start()

2
init.d/swclock.in
View File

@ -8,7 +8,7 @@ depend()
{ {
before * before *
provide clock provide clock
keyword -openvz -prefix -uml -vserver -xenu -lxc keyword -openvz -prefix -systemd-nspawn -uml -vserver -xenu -lxc
} }
# swclock is an OpenRC built in # swclock is an OpenRC built in

2
init.d/sysctl.Linux.in
View File

@ -5,7 +5,7 @@
depend() depend()
{ {
before bootmisc logger before bootmisc logger
keyword -prefix -vserver keyword -prefix -systemd-nspawn -vserver
} }
start() start()

2
init.d/sysfs.in
View File

@ -8,7 +8,7 @@ sysfs_opts=nodev,noexec,nosuid
depend() depend()
{ {
keyword -lxc -prefix -vserver keyword -lxc -prefix -systemd-nspawn -vserver
} }
mount_sys() mount_sys()

2
init.d/termencoding.in
View File

@ -9,7 +9,7 @@ ttyn=${rc_tty_number:-${RC_TTY_NUMBER:-12}}
depend() depend()
{ {
keyword -lxc -openvz -prefix -uml -vserver -xenu keyword -lxc -openvz -prefix -systemd-nspawn -uml -vserver -xenu
use root use root
after bootmisc after bootmisc
} }

2
init.d/urandom.in
View File

@ -8,7 +8,7 @@ description="Initializes the random number generator."
depend() depend()
{ {
need localmount need localmount
keyword -jail -lxc -openvz -prefix keyword -jail -lxc -openvz -prefix -systemd-nspawn
} }
save_seed() save_seed()