From 9214156aa720540982ee585a47a23b8c539141e6 Mon Sep 17 00:00:00 2001 From: Yiyang Wu Date: Sun, 7 Jan 2024 12:19:22 +0800 Subject: [PATCH 1/4] rc.h.in: drop PREFIX macro, thus unify softlevel file location Warning: it conflicts with a9272f50f75849f5d7a787cab4c54f5a2d158f58 Signed-off-by: Yiyang Wu --- src/librc/rc.h.in | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/librc/rc.h.in b/src/librc/rc.h.in index 69d9d0e47..e550564e5 100644 --- a/src/librc/rc.h.in +++ b/src/librc/rc.h.in @@ -26,11 +26,10 @@ extern "C" { #define RC_SYSCONFDIR "@SYSCONFDIR@" #define RC_LIBDIR "@PREFIX@/@LIB@/rc" #define RC_LIBEXECDIR "@LIBEXECDIR@" -#if defined(PREFIX) #define RC_SVCDIR RC_LIBEXECDIR "/init.d" -#elif defined(__linux__) || (defined(__FreeBSD_kernel__) && \ +#if defined(__linux__) || (defined(__FreeBSD_kernel__) && \ defined(__GLIBC__)) || defined(__GNU__) -#define RC_SVCDIR "/run/openrc" +#define RC_SVCDIR RC_PREFIX "/run/openrc" #else #define RC_SVCDIR RC_LIBEXECDIR "/init.d" #endif From 6958aff506a23bd0b83734c1fb2956453a025521 Mon Sep 17 00:00:00 2001 From: Yiyang Wu Date: Sun, 7 Jan 2024 15:36:25 +0800 Subject: [PATCH 2/4] Drop PREFIX macro. RC_PREFIX is set in all scenarios Signed-off-by: Yiyang Wu --- man/openrc-run.8 | 11 ++--------- src/shared/misc.c | 2 -- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/man/openrc-run.8 b/man/openrc-run.8 index 0c977f963..7e5d17693 100644 --- a/man/openrc-run.8 +++ b/man/openrc-run.8 @@ -304,8 +304,6 @@ in Same as -jail, but for Linux Resource Containers (LXC). .It Dv -openvz Same as -jail, but for OpenVZ systems. -.It Dv -prefix -Same as -jail, but for Prefix systems. .It Dv -rkt Same as -jail, but for RKT systems. .It Dv -uml @@ -561,9 +559,6 @@ Default runlevel chosen. Default is default. .It Va RC_SYS A special variable to describe the system more. Possible values are OPENVZ, XENU, XEN0, UML and VSERVER. -.It Va RC_PREFIX -In a Gentoo Prefix installation, this variable contains the prefix -offset. Otherwise it is undefined. .It Va RC_UNAME The result of `uname -s`. .It Va RC_CMD @@ -615,10 +610,8 @@ rc_provide_tap1="!net" # To put in in /etc/rc.conf you would do it like this rc_net_tap1_provide="!net" -# It's also possible to negate keywords. This is mainly useful for prefix -# users testing OpenRC. -rc_keyword="!-prefix" -# This can also be used to block a script from running in all +# It's also possible to negate keywords. +# This can be used to block a script from running in all # containers except one or two rc_keyword="!-containers !-docker" .Ed diff --git a/src/shared/misc.c b/src/shared/misc.c index 28f4e2352..b55e41e0d 100644 --- a/src/shared/misc.c +++ b/src/shared/misc.c @@ -197,9 +197,7 @@ env_config(void) if (sys) setenv("RC_SYS", sys, 1); -#ifdef PREFIX setenv("RC_PREFIX", RC_PREFIX, 1); -#endif /* Some scripts may need to take a different code path if Linux/FreeBSD, etc From 0b7450a1c0d0ae73a55c5de59808714266bb6bab Mon Sep 17 00:00:00 2001 From: Yiyang Wu Date: Sun, 7 Jan 2024 15:37:42 +0800 Subject: [PATCH 3/4] Drop PREFIX macro Signed-off-by: Yiyang Wu --- src/librc/librc.c | 4 ---- 1 file changed, 4 deletions(-) diff --git a/src/librc/librc.c b/src/librc/librc.c index a1bd706d7..6f249937c 100644 --- a/src/librc/librc.c +++ b/src/librc/librc.c @@ -234,9 +234,6 @@ get_systype(void) static const char * detect_prefix(const char *systype) { -#ifdef PREFIX - return RC_SYS_PREFIX; -#else if (systype) { if (strcmp(systype, RC_SYS_NONE) == 0) return NULL; @@ -245,7 +242,6 @@ detect_prefix(const char *systype) } return NULL; -#endif } static const char * From b76b3b272cb03c9755027e29c15658aeee824589 Mon Sep 17 00:00:00 2001 From: William Hubbs Date: Mon, 25 Mar 2024 13:13:55 -0500 Subject: [PATCH 4/4] remove -prefix keyword from service scripts --- init.d/adjkerntz.in | 2 +- init.d/agetty.in | 1 - init.d/binfmt.in | 2 +- init.d/bootmisc.in | 2 +- init.d/cgroups.in | 2 +- init.d/consolefont.in | 2 +- init.d/devd.in | 2 +- init.d/devfs.in | 2 +- init.d/dmesg.in | 2 +- init.d/dumpon.in | 2 +- init.d/fsck.in | 2 +- init.d/hostid.in | 2 +- init.d/hostname.in | 2 +- init.d/hwclock.in | 2 +- init.d/keymaps.in | 2 +- init.d/killprocs.in | 1 - init.d/localmount.in | 2 +- init.d/loopback.in | 2 +- init.d/mixer.in | 2 +- init.d/modules.in | 2 +- init.d/mount-ro.in | 2 +- init.d/moused.in | 2 +- init.d/mtab.in | 2 +- init.d/net-online.in | 2 +- init.d/netmount.in | 2 +- init.d/network.in | 2 +- init.d/newsyslog.in | 1 - init.d/numlock.in | 2 +- init.d/pf.in | 2 +- init.d/powerd.in | 2 +- init.d/procfs.in | 2 +- init.d/rc-enabled.in | 1 - init.d/root.in | 2 +- init.d/save-keymaps.in | 2 +- init.d/save-termencoding.in | 2 +- init.d/savecore.in | 2 +- init.d/seedrng.in | 2 +- init.d/staticroute.in | 2 +- init.d/swap-blk.in | 2 +- init.d/swap.in | 2 +- init.d/swclock.in | 2 +- init.d/syscons.in | 2 +- init.d/sysctl.in | 2 +- init.d/sysfs.in | 2 +- init.d/syslogd.in | 1 - init.d/termencoding.in | 2 +- init.d/ttys.in | 1 - init.d/urandom.in | 2 +- init.d/wscons.in | 1 - 49 files changed, 42 insertions(+), 49 deletions(-) diff --git a/init.d/adjkerntz.in b/init.d/adjkerntz.in index adf719360..57123f476 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 329cd2140..f4bf7458a 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 ecf9b8a64..8e37c2241 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 233dfc55b..d73d11170 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 ac1f5cc85..2eb2fdf99 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 8c96af50b..dac5a3cfc 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 9931674d0..2c132f39e 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 0cc3ba033..abfe43b8d 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 e80d140af..8f26b0bfb 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 ec5439c4f..cd94c0091 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 008b1bca6..55d810f2e 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 cd0640795..ebcba67e0 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 3d70a2f34..f8765ee98 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 aa765cce4..81173121b 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 fa7f1958a..43b7e136d 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 fbcfa4a81..49f8643d3 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 8a66eb8d9..c1322e2d6 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 c998924f6..d8fea5a9f 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 0e90b3b85..b75c09c59 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 9a0646077..8f5bb5b01 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 05c828dac..6759699bb 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 ebc4f28c9..6b3757b1c 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 1b3360375..ee6ff83e6 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 7f753aaea..c0be735eb 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 2296e91c9..e37f0b9e2 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 77a1614b6..1a6db126e 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 01543f732..23fa2ce82 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 7be58c994..a00573cce 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 49f41f502..196f78bd9 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 fb94d5b8a..d9c4fe609 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 024edaf09..763b4e9e3 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 3b722f465..898f604c4 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 2f7d82f26..0ffa89a54 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 2c3b33271..535731c8f 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 bf08de39e..da3b0ee4a 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 7732bbec7..9bcdd2b71 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 15dd3f54a..cd72abf83 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 f8b8bb12b..b2c994073 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 d8ae64d37..cc5ffcdf0 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 40c3dbaf5..a5ec61345 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 63c052d1e..24f325464 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 83048b72e..b3a1c88c6 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 5e55df783..c68cca4d7 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 37745ff27..b02883b5c 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 9c101754d..bbc122eb5 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 783df525b..f7c9e115c 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 c8b82360a..37d304191 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 82020853c..efa4ef889 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 499c14977..20c3fb880 100644 --- a/init.d/wscons.in +++ b/init.d/wscons.in @@ -13,7 +13,6 @@ depend() { after clock need localmount - keyword -prefix } start()