diff options
49 files changed, 42 insertions, 49 deletions
diff --git a/init.d/adjkerntz.in b/init.d/adjkerntz.in index adf71936..57123f47 100644 --- a/init.d/adjkerntz.in +++ b/init.d/adjkerntz.in @@ -30,7 +30,7 @@ depend() [ "$clock" != "UTC" -a ! -e /etc/wall_cmos_clock ]; then need root fi - keyword -jail -prefix + keyword -jail } start() diff --git a/init.d/agetty.in b/init.d/agetty.in index 329cd214..f4bf7458 100644 --- a/init.d/agetty.in +++ b/init.d/agetty.in @@ -20,7 +20,6 @@ pidfile="/run/${RC_SVCNAME}.pid" depend() { after local - keyword -prefix provide getty } diff --git a/init.d/binfmt.in b/init.d/binfmt.in index ecf9b8a6..8e37c224 100644 --- a/init.d/binfmt.in +++ b/init.d/binfmt.in @@ -15,7 +15,7 @@ depend() { after clock procfs use modules devfs - keyword -docker -lxc -openvz -prefix -systemd-nspawn -vserver + keyword -docker -lxc -openvz -systemd-nspawn -vserver } start() diff --git a/init.d/bootmisc.in b/init.d/bootmisc.in index 233dfc55..d73d1117 100644 --- a/init.d/bootmisc.in +++ b/init.d/bootmisc.in @@ -14,7 +14,7 @@ depend() need localmount before logger after clock root sysctl - keyword -prefix -timeout + keyword -timeout } : ${wipe_tmp:=${WIPE_TMP:-yes}} diff --git a/init.d/cgroups.in b/init.d/cgroups.in index ac1f5cc8..2eb2fdf9 100644 --- a/init.d/cgroups.in +++ b/init.d/cgroups.in @@ -15,7 +15,7 @@ description="Mount the control groups." depend() { - keyword -docker -prefix -systemd-nspawn -vserver + keyword -docker -systemd-nspawn -vserver after sysfs } diff --git a/init.d/consolefont.in b/init.d/consolefont.in index 8c96af50..dac5a3cf 100644 --- a/init.d/consolefont.in +++ b/init.d/consolefont.in @@ -15,7 +15,7 @@ depend() { need termencoding after hotplug bootmisc modules - keyword -docker -lxc -openvz -prefix -systemd-nspawn -uml -vserver -xenu + keyword -docker -lxc -openvz -systemd-nspawn -uml -vserver -xenu } start() diff --git a/init.d/devd.in b/init.d/devd.in index 9931674d..2c132f39 100644 --- a/init.d/devd.in +++ b/init.d/devd.in @@ -17,7 +17,7 @@ depend() { need localmount after bootmisc before net.lo0 - keyword -jail -prefix + keyword -jail } start_pre() { diff --git a/init.d/devfs.in b/init.d/devfs.in index 0cc3ba03..abfe43b8 100644 --- a/init.d/devfs.in +++ b/init.d/devfs.in @@ -15,7 +15,7 @@ depend() { provide dev-mount before dev - keyword -docker -prefix -systemd-nspawn -vserver + keyword -docker -systemd-nspawn -vserver } mount_dev() diff --git a/init.d/dmesg.in b/init.d/dmesg.in index e80d140a..8f26b0bf 100644 --- a/init.d/dmesg.in +++ b/init.d/dmesg.in @@ -14,7 +14,7 @@ description="Set the dmesg level for a cleaner boot" depend() { before dev modules - keyword -docker -lxc -prefix -systemd-nspawn -vserver + keyword -docker -lxc -systemd-nspawn -vserver } start() diff --git a/init.d/dumpon.in b/init.d/dumpon.in index ec5439c4..cd94c009 100644 --- a/init.d/dumpon.in +++ b/init.d/dumpon.in @@ -14,7 +14,7 @@ description="Configures a specific kernel dump device." depend() { after clock need swap - keyword -jail -prefix + keyword -jail } start() { diff --git a/init.d/fsck.in b/init.d/fsck.in index 008b1bca..55d810f2 100644 --- a/init.d/fsck.in +++ b/init.d/fsck.in @@ -17,7 +17,7 @@ depend() { after clock use dev clock modules - keyword -docker -jail -lxc -openvz -prefix -systemd-nspawn -timeout -vserver -uml + keyword -docker -jail -lxc -openvz -systemd-nspawn -timeout -vserver -uml } _abort() { diff --git a/init.d/hostid.in b/init.d/hostid.in index cd064079..ebcba67e 100644 --- a/init.d/hostid.in +++ b/init.d/hostid.in @@ -17,7 +17,7 @@ depend() use root after clock before devd net - keyword -jail -prefix + keyword -jail } _set() diff --git a/init.d/hostname.in b/init.d/hostname.in index 3d70a2f3..f8765ee9 100644 --- a/init.d/hostname.in +++ b/init.d/hostname.in @@ -14,7 +14,7 @@ description="Sets the hostname of the machine." depend() { after clock - keyword -docker -lxc -prefix -systemd-nspawn + keyword -docker -lxc -systemd-nspawn } start() diff --git a/init.d/hwclock.in b/init.d/hwclock.in index aa765cce..81173121 100644 --- a/init.d/hwclock.in +++ b/init.d/hwclock.in @@ -34,7 +34,7 @@ depend() if yesno $clock_adjfile; then use root fi - keyword -docker -lxc -openvz -prefix -systemd-nspawn -uml -vserver -xenu + keyword -docker -lxc -openvz -systemd-nspawn -uml -vserver -xenu } setupopts() diff --git a/init.d/keymaps.in b/init.d/keymaps.in index fa7f1958..43b7e136 100644 --- a/init.d/keymaps.in +++ b/init.d/keymaps.in @@ -15,7 +15,7 @@ depend() { need termencoding after devfs - keyword -docker -lxc -openvz -prefix -systemd-nspawn -uml -vserver -xenu + keyword -docker -lxc -openvz -systemd-nspawn -uml -vserver -xenu } start() diff --git a/init.d/killprocs.in b/init.d/killprocs.in index fbcfa4a8..49f8643d 100644 --- a/init.d/killprocs.in +++ b/init.d/killprocs.in @@ -13,7 +13,6 @@ description="Kill all processes so we can unmount disks cleanly." depend() { - keyword -prefix } start() diff --git a/init.d/localmount.in b/init.d/localmount.in index 8a66eb8d..c1322e2d 100644 --- a/init.d/localmount.in +++ b/init.d/localmount.in @@ -16,7 +16,7 @@ depend() need fsck root use lvm modules after clock lvm modules - keyword -docker -jail -lxc -prefix -systemd-nspawn -vserver + keyword -docker -jail -lxc -systemd-nspawn -vserver } start() diff --git a/init.d/loopback.in b/init.d/loopback.in index c998924f..d8fea5a9 100644 --- a/init.d/loopback.in +++ b/init.d/loopback.in @@ -14,7 +14,7 @@ description="Configures the loopback interface." depend() { after clock - keyword -jail -prefix -systemd-nspawn -vserver + keyword -jail -systemd-nspawn -vserver } start() diff --git a/init.d/mixer.in b/init.d/mixer.in index 0e90b3b8..b75c09c5 100644 --- a/init.d/mixer.in +++ b/init.d/mixer.in @@ -14,7 +14,7 @@ extra_commands="restore" depend() { need localmount - keyword -jail -prefix + keyword -jail } restore() diff --git a/init.d/modules.in b/init.d/modules.in index 9a064607..8f5bb5b0 100644 --- a/init.d/modules.in +++ b/init.d/modules.in @@ -15,7 +15,7 @@ depend() { use isapnp provide modules-load - keyword -docker -lxc -openvz -prefix -systemd-nspawn -vserver + keyword -docker -lxc -openvz -systemd-nspawn -vserver } find_modfiles() diff --git a/init.d/mount-ro.in b/init.d/mount-ro.in index 05c828da..6759699b 100644 --- a/init.d/mount-ro.in +++ b/init.d/mount-ro.in @@ -14,7 +14,7 @@ description="Re-mount filesystems read-only for a clean reboot." depend() { after killprocs savecache - keyword -docker -lxc -openvz -prefix -systemd-nspawn -vserver + keyword -docker -lxc -openvz -systemd-nspawn -vserver } start() diff --git a/init.d/moused.in b/init.d/moused.in index ebc4f28c..6b3757b1 100644 --- a/init.d/moused.in +++ b/init.d/moused.in @@ -23,7 +23,7 @@ depend() { need localmount after bootmisc - keyword -jail -prefix + keyword -jail } start() diff --git a/init.d/mtab.in b/init.d/mtab.in index 1b336037..ee6ff83e 100644 --- a/init.d/mtab.in +++ b/init.d/mtab.in @@ -16,7 +16,7 @@ depend() after clock before localmount need root - keyword -prefix -systemd-nspawn + keyword -systemd-nspawn } start() diff --git a/init.d/net-online.in b/init.d/net-online.in index 7f753aae..c0be735e 100644 --- a/init.d/net-online.in +++ b/init.d/net-online.in @@ -16,7 +16,7 @@ depend() after modules net need sysfs provide network-online - keyword -docker -jail -lxc -openvz -prefix -systemd-nspawn -uml -vserver + keyword -docker -jail -lxc -openvz -systemd-nspawn -uml -vserver } get_interfaces() diff --git a/init.d/netmount.in b/init.d/netmount.in index 2296e91c..e37f0b9e 100644 --- a/init.d/netmount.in +++ b/init.d/netmount.in @@ -26,7 +26,7 @@ depend() use afc-client amd openvpn use dns use root - keyword -docker -jail -lxc -prefix -systemd-nspawn -vserver + keyword -docker -jail -lxc -systemd-nspawn -vserver } start() diff --git a/init.d/network.in b/init.d/network.in index 77a1614b..1a6db126 100644 --- a/init.d/network.in +++ b/init.d/network.in @@ -22,7 +22,7 @@ depend() if [ -n "$(interfaces)" ]; then provide net fi - keyword -jail -prefix -vserver + keyword -jail -vserver } uniqify() diff --git a/init.d/newsyslog.in b/init.d/newsyslog.in index 01543f73..23fa2ce8 100644 --- a/init.d/newsyslog.in +++ b/init.d/newsyslog.in @@ -15,7 +15,6 @@ depend() { after clock need localmount - keyword -prefix } start() diff --git a/init.d/numlock.in b/init.d/numlock.in index 7be58c99..a00573cc 100644 --- a/init.d/numlock.in +++ b/init.d/numlock.in @@ -15,7 +15,7 @@ ttyn=${rc_tty_number:-${RC_TTY_NUMBER:-12}} depend() { - keyword -docker -lxc -openvz -prefix -systemd-nspawn -vserver + keyword -docker -lxc -openvz -systemd-nspawn -vserver } _setleds() diff --git a/init.d/pf.in b/init.d/pf.in index 49f41f50..196f78bd 100644 --- a/init.d/pf.in +++ b/init.d/pf.in @@ -18,7 +18,7 @@ extra_started_commands="reload" depend() { need localmount - keyword -jail -prefix + keyword -jail } start() diff --git a/init.d/powerd.in b/init.d/powerd.in index fb94d5b8..d9c4fe60 100644 --- a/init.d/powerd.in +++ b/init.d/powerd.in @@ -19,7 +19,7 @@ depend() need localmount use logger after bootmisc - keyword -jail -prefix + keyword -jail } start_pre() diff --git a/init.d/procfs.in b/init.d/procfs.in index 024edaf0..763b4e9e 100644 --- a/init.d/procfs.in +++ b/init.d/procfs.in @@ -16,7 +16,7 @@ depend() after clock use devfs want modules - keyword -docker -lxc -openvz -prefix -systemd-nspawn -vserver + keyword -docker -lxc -openvz -systemd-nspawn -vserver } start() diff --git a/init.d/rc-enabled.in b/init.d/rc-enabled.in index 3b722f46..898f604c 100644 --- a/init.d/rc-enabled.in +++ b/init.d/rc-enabled.in @@ -14,7 +14,6 @@ depend() need localmount net after * before local - keyword -prefix } start() diff --git a/init.d/root.in b/init.d/root.in index 2f7d82f2..0ffa89a5 100644 --- a/init.d/root.in +++ b/init.d/root.in @@ -15,7 +15,7 @@ depend() { after clock need fsck - keyword -docker -jail -lxc -openvz -prefix -systemd-nspawn -vserver + keyword -docker -jail -lxc -openvz -systemd-nspawn -vserver } start() diff --git a/init.d/save-keymaps.in b/init.d/save-keymaps.in index 2c3b3327..535731c8 100644 --- a/init.d/save-keymaps.in +++ b/init.d/save-keymaps.in @@ -13,7 +13,7 @@ depend() { need termencoding after bootmisc clock keymaps - keyword -docker -lxc -openvz -prefix -systemd-nspawn -uml -vserver -xenu + keyword -docker -lxc -openvz -systemd-nspawn -uml -vserver -xenu } start() diff --git a/init.d/save-termencoding.in b/init.d/save-termencoding.in index bf08de39..da3b0ee4 100644 --- a/init.d/save-termencoding.in +++ b/init.d/save-termencoding.in @@ -14,7 +14,7 @@ ttyn=${rc_tty_number:-${RC_TTY_NUMBER:-12}} depend() { - keyword -docker -lxc -openvz -prefix -systemd-nspawn -uml -vserver -xenu + keyword -docker -lxc -openvz -systemd-nspawn -uml -vserver -xenu use root after bootmisc clock termencoding } diff --git a/init.d/savecore.in b/init.d/savecore.in index 7732bbec..9bcdd2b7 100644 --- a/init.d/savecore.in +++ b/init.d/savecore.in @@ -16,7 +16,7 @@ depend() need dumpon localmount after clock before encswap - keyword -jail -prefix + keyword -jail } start() diff --git a/init.d/seedrng.in b/init.d/seedrng.in index 15dd3f54..cd72abf8 100644 --- a/init.d/seedrng.in +++ b/init.d/seedrng.in @@ -15,7 +15,7 @@ depend() { after clock need localmount - keyword -docker -jail -lxc -openvz -prefix -systemd-nspawn + keyword -docker -jail -lxc -openvz -systemd-nspawn provide urandom } diff --git a/init.d/staticroute.in b/init.d/staticroute.in index f8b8bb12..b2c99407 100644 --- a/init.d/staticroute.in +++ b/init.d/staticroute.in @@ -19,7 +19,7 @@ depend() after clock provide net use network - keyword -jail -prefix -vserver + keyword -jail -vserver } pre_flight_checks() diff --git a/init.d/swap-blk.in b/init.d/swap-blk.in index d8ae64d3..cc5ffcdf 100644 --- a/init.d/swap-blk.in +++ b/init.d/swap-blk.in @@ -13,7 +13,7 @@ depend() { after clock before fsck - keyword -jail -prefix + keyword -jail } start() diff --git a/init.d/swap.in b/init.d/swap.in index 40c3dbaf..a5ec6134 100644 --- a/init.d/swap.in +++ b/init.d/swap.in @@ -13,7 +13,7 @@ depend() { after clock root before localmount - keyword -docker -jail -lxc -openvz -prefix -systemd-nspawn -vserver + keyword -docker -jail -lxc -openvz -systemd-nspawn -vserver } start() diff --git a/init.d/swclock.in b/init.d/swclock.in index 63c052d1..24f32546 100644 --- a/init.d/swclock.in +++ b/init.d/swclock.in @@ -15,7 +15,7 @@ swclock_file="${swclock_file:-/var/lib/misc/openrc-shutdowntime}" depend() { provide clock - keyword -docker -lxc -openvz -prefix -systemd-nspawn -uml -vserver -xenu + keyword -docker -lxc -openvz -systemd-nspawn -uml -vserver -xenu } # swclock is an OpenRC built in diff --git a/init.d/syscons.in b/init.d/syscons.in index 83048b72..b3a1c88c 100644 --- a/init.d/syscons.in +++ b/init.d/syscons.in @@ -12,7 +12,7 @@ depend() { after clock need localmount - keyword -jail -prefix + keyword -jail } start() { diff --git a/init.d/sysctl.in b/init.d/sysctl.in index 5e55df78..c68cca4d 100644 --- a/init.d/sysctl.in +++ b/init.d/sysctl.in @@ -13,7 +13,7 @@ depend() { after clock before bootmisc logger - keyword -prefix -systemd-nspawn -vserver + keyword -systemd-nspawn -vserver } BSD_sysctl() diff --git a/init.d/sysfs.in b/init.d/sysfs.in index 37745ff2..b02883b5 100644 --- a/init.d/sysfs.in +++ b/init.d/sysfs.in @@ -15,7 +15,7 @@ sysfs_opts=nodev,noexec,nosuid depend() { - keyword -docker -lxc -prefix -systemd-nspawn -vserver + keyword -docker -lxc -systemd-nspawn -vserver } mount_sys() diff --git a/init.d/syslogd.in b/init.d/syslogd.in index 9c101754..bbc122eb 100644 --- a/init.d/syslogd.in +++ b/init.d/syslogd.in @@ -23,5 +23,4 @@ depend() use net newsyslog need localmount after bootmisc clock - keyword -prefix } diff --git a/init.d/termencoding.in b/init.d/termencoding.in index 783df525..f7c9e115 100644 --- a/init.d/termencoding.in +++ b/init.d/termencoding.in @@ -16,7 +16,7 @@ ttyn=${rc_tty_number:-${RC_TTY_NUMBER:-12}} depend() { - keyword -docker -lxc -openvz -prefix -systemd-nspawn -uml -vserver -xenu + keyword -docker -lxc -openvz -systemd-nspawn -uml -vserver -xenu after devfs } diff --git a/init.d/ttys.in b/init.d/ttys.in index c8b82360..37d30419 100644 --- a/init.d/ttys.in +++ b/init.d/ttys.in @@ -12,7 +12,6 @@ depend() { after clock fsck - keyword -prefix } start() diff --git a/init.d/urandom.in b/init.d/urandom.in index 82020853..efa4ef88 100644 --- a/init.d/urandom.in +++ b/init.d/urandom.in @@ -16,7 +16,7 @@ depend() { after clock need localmount - keyword -docker -jail -lxc -openvz -prefix -systemd-nspawn + keyword -docker -jail -lxc -openvz -systemd-nspawn } save_seed() diff --git a/init.d/wscons.in b/init.d/wscons.in index 499c1497..20c3fb88 100644 --- a/init.d/wscons.in +++ b/init.d/wscons.in @@ -13,7 +13,6 @@ depend() { after clock need localmount - keyword -prefix } start() |