Remove prefix support

I spoke with the prefix team sometime back and was told that they do not
have an interest in using OpenRC on prefix systems.

49 files changed, 43 insertions, 82 deletions

diff --git a/etc/rc.conf.FreeBSD b/etc/rc.conf.FreeBSD
index d2b6d948..92640e81 100644
--- a/etc/rc.conf.FreeBSD
+++ b/etc/rc.conf.FreeBSD
@@ -4,9 +4,7 @@
 # This is the subsystem type. Valid options on FreeBSD:
 # ""        - nothing special
 # "jail"    - FreeBSD jails
-# "prefix"  - Prefix
-# If this is commented out, automatic detection will be attempted.
-# Note that automatic detection does not work in a prefix environment.
+# If this is commented out, automatic detection will be used.
 #
 # This should be set to the value representing the environment this file is
 # PRESENTLY in, not the virtualization the environment is capable of.
diff --git a/etc/rc.conf.Linux b/etc/rc.conf.Linux
index d79165d8..ee23bc30 100644
--- a/etc/rc.conf.Linux
+++ b/etc/rc.conf.Linux
@@ -5,14 +5,11 @@
 # ""        - nothing special
 # "lxc"     - Linux Containers
 # "openvz"  - Linux OpenVZ
-# "prefix"  - Prefix
 # "uml"     - Usermode Linux
 # "vserver" - Linux vserver
 # "xen0"    - Xen0 Domain
 # "xenU"    - XenU Domain
-# If this is commented out, automatic detection will be attempted.
-# Note that autodetection will not work in a prefix environment or in a
-# linux container.
+# If this is commented out, automatic detection will be used.
 #
 # This should be set to the value representing the environment this file is
 # PRESENTLY in, not the virtualization the environment is capable of.
diff --git a/etc/rc.conf.NetBSD b/etc/rc.conf.NetBSD
index af7adf67..633e2a14 100644
--- a/etc/rc.conf.NetBSD
+++ b/etc/rc.conf.NetBSD
@@ -3,11 +3,9 @@
 
 # This is the subsystem type. Valid options on NetBSD:
 # ""        - nothing special
-# "prefix"  - Prefix
 # "xen0"    - Xen0 Domain
 # "xenU"    - XenU Domain
-# If this is commented out, automatic detection will be attempted.
-# Note that automatic detection does not work in a prefix environment.
+# If this is commented out, automatic detection will be used.
 #
 # This should be set to the value representing the environment this file is
 # PRESENTLY in, not the virtualization the environment is capable of.
diff --git a/init.d/adjkerntz.in b/init.d/adjkerntz.in
index 76ad175f..21fc1df0 100644
--- a/init.d/adjkerntz.in
+++ b/init.d/adjkerntz.in
@@ -22,7 +22,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/bootmisc.in b/init.d/bootmisc.in
index a2afbf9f..31448757 100644
--- a/init.d/bootmisc.in
+++ b/init.d/bootmisc.in
@@ -7,7 +7,7 @@ depend()
 	need localmount
 	before logger
 	after clock sysctl
-	keyword -prefix -timeout
+	keyword -timeout
 }
 
 : ${wipe_tmp:=${WIPE_TMP:-yes}}
diff --git a/init.d/consolefont.in b/init.d/consolefont.in
index 66b780d1..53c43af2 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 -uml -vserver -xenu -lxc
 }
 
 start()
diff --git a/init.d/devd.in b/init.d/devd.in
index b474b759..7943e0d0 100644
--- a/init.d/devd.in
+++ b/init.d/devd.in
@@ -10,7 +10,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 6a41354f..ff43f1e6 100644
--- a/init.d/devfs.in
+++ b/init.d/devfs.in
@@ -6,7 +6,7 @@ description="Mount system critical filesystems in /dev."
 
 depend() {
 	use dev
-	keyword -prefix -vserver
+	keyword -vserver
 }
 
 start() {
diff --git a/init.d/dumpon.in b/init.d/dumpon.in
index 4450bf94..282e2361 100644
--- a/init.d/dumpon.in
+++ b/init.d/dumpon.in
@@ -6,7 +6,7 @@ description="Configures a specific kernel dump device."
 
 depend() {
 	need swap
-	keyword -jail -prefix
+	keyword -jail
 }
 
 start() {
diff --git a/init.d/fsck.in b/init.d/fsck.in
index 049caad2..d53a7ed6 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
+	keyword -jail -openvz -timeout -vserver -lxc
 }
 
 _abort() {
diff --git a/init.d/hostid.in b/init.d/hostid.in
index b682b3de..a028c904 100644
--- a/init.d/hostid.in
+++ b/init.d/hostid.in
@@ -9,7 +9,7 @@ depend()
 {
 	use root
 	before devd net
-	keyword -jail -prefix
+	keyword -jail
 }
 
 _set()
diff --git a/init.d/hostname.in b/init.d/hostname.in
index 2b0ec810..f5b6fc80 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 -lxc
 }
 
 start()
diff --git a/init.d/hwclock.in b/init.d/hwclock.in
index eb44f62a..de6e8699 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 -uml -vserver -xenu -lxc
 }
 
 setupopts()
diff --git a/init.d/keymaps.in b/init.d/keymaps.in
index a55a0e06..86aed3ea 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 -uml -vserver -xenu -lxc
 }
 
 start()
diff --git a/init.d/killprocs.in b/init.d/killprocs.in
index 7f1cf917..ea1e84b3 100644
--- a/init.d/killprocs.in
+++ b/init.d/killprocs.in
@@ -4,11 +4,6 @@
 
 description="Kill all processes so we can unmount disks cleanly."
 
-depend()
-{
-	keyword -prefix
-}
-
 start()
 {
 	ebegin "Terminating remaining processes"
diff --git a/init.d/localmount.in b/init.d/localmount.in
index 68b33db5..158bafcd 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 -openvz -vserver -lxc
 }
 
 start()
diff --git a/init.d/mixer.in b/init.d/mixer.in
index a08aea13..7163f860 100644
--- a/init.d/mixer.in
+++ b/init.d/mixer.in
@@ -7,7 +7,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 72f14e76..11006802 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 -vserver -lxc
 }
 
 start()
diff --git a/init.d/mount-ro.in b/init.d/mount-ro.in
index 79b2e02e..4b07457b 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 -prefix -openvz -vserver -lxc
+	keyword -openvz -vserver -lxc
 }
 
 start()
diff --git a/init.d/moused.in b/init.d/moused.in
index cdcf36ad..8ce8ffa9 100644
--- a/init.d/moused.in
+++ b/init.d/moused.in
@@ -16,7 +16,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 0be5adbc..69b3b495 100644
--- a/init.d/mtab.in
+++ b/init.d/mtab.in
@@ -7,7 +7,6 @@ description="Update /etc/mtab to match what the kernel knows about"
 depend()
 {
 	need root
-	keyword -prefix
 }
 
 start()
diff --git a/init.d/net.lo.in b/init.d/net.lo.in
index 3439bec9..8a186a0b 100644
--- a/init.d/net.lo.in
+++ b/init.d/net.lo.in
@@ -20,7 +20,7 @@ depend()
 
 	need localmount
 	after bootmisc
-	keyword -jail -prefix -vserver
+	keyword -jail -vserver
 
 	case "${IFACE}" in
 		lo|lo0) provide lo;;
diff --git a/init.d/netmount.in b/init.d/netmount.in
index 963ad26d..cf5971c0 100644
--- a/init.d/netmount.in
+++ b/init.d/netmount.in
@@ -35,7 +35,7 @@ depend()
 	need net $pmap
 	use afc-client amd autofs openvpn
 	use dns nfs nfsmount portmap rpcbind rpc.statd rpc.lockd
-	keyword -jail -prefix -vserver
+	keyword -jail -vserver
 }
 
 start()
diff --git a/init.d/network.in b/init.d/network.in
index 1c70785d..d65a6a9d 100644
--- a/init.d/network.in
+++ b/init.d/network.in
@@ -13,7 +13,7 @@ depend()
 	need localmount
 	after bootmisc
 	provide net
-	keyword -jail -prefix -vserver
+	keyword -jail -vserver
 }
 
 uniqify()
diff --git a/init.d/newsyslog.in b/init.d/newsyslog.in
index 6cf72e65..878bf4da 100644
--- a/init.d/newsyslog.in
+++ b/init.d/newsyslog.in
@@ -7,7 +7,6 @@ required_files="/etc/newsyslog.conf"
 depend()
 {
 	need localmount
-	keyword -prefix
 }
 
 start()
diff --git a/init.d/numlock.in b/init.d/numlock.in
index 3cb8bee3..7f795380 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 -vserver -lxc
 }
 
 _setleds()
diff --git a/init.d/pf.in b/init.d/pf.in
index 1097ac85..804c3a0b 100644
--- a/init.d/pf.in
+++ b/init.d/pf.in
@@ -11,7 +11,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 10ffeccb..17e53751 100644
--- a/init.d/powerd.in
+++ b/init.d/powerd.in
@@ -12,7 +12,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 baa33adb..a6136a30 100644
--- a/init.d/procfs.in
+++ b/init.d/procfs.in
@@ -8,7 +8,7 @@ depend()
 {
 	use modules devfs
 	need localmount
-	keyword -prefix -vserver -lxc
+	keyword -openvz -vserver -lxc
 }
 
 start()
diff --git a/init.d/rc-enabled.in b/init.d/rc-enabled.in
index 9ba73b0a..c2d38d79 100644
--- a/init.d/rc-enabled.in
+++ b/init.d/rc-enabled.in
@@ -7,7 +7,6 @@ depend()
 	need localmount net
 	after *
 	before local
-	keyword -prefix
 }
 
 start()
diff --git a/init.d/root.in b/init.d/root.in
index c8ae4f12..fd95ab7b 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 -vserver -lxc
 }
 
 start()
diff --git a/init.d/savecore.in b/init.d/savecore.in
index 12c4d3fc..14230466 100644
--- a/init.d/savecore.in
+++ b/init.d/savecore.in
@@ -7,7 +7,7 @@ description="Saves a kernel dump."
 depend()
 {
 	need localmount
-	keyword -jail -prefix
+	keyword -jail
 }
 
 start()
diff --git a/init.d/staticroute.in b/init.d/staticroute.in
index 294f890d..7ace6591 100644
--- a/init.d/staticroute.in
+++ b/init.d/staticroute.in
@@ -12,7 +12,7 @@ depend()
 {
 	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 a7862ee2..6f28e217 100644
--- a/init.d/swap-blk.in
+++ b/init.d/swap-blk.in
@@ -5,7 +5,7 @@
 depend()
 {
 	before fsck
-	keyword -jail -prefix
+	keyword -jail
 }
 
 start()
diff --git a/init.d/swap.in b/init.d/swap.in
index fa08b4d0..9e8ddbd9 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 -vserver -lxc
 }
 
 start()
diff --git a/init.d/swclock.in b/init.d/swclock.in
index 077f258d..f10689b1 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 -uml -vserver -xenu -lxc
 }
 
 # swclock is an OpenRC built in
diff --git a/init.d/syscons.in b/init.d/syscons.in
index 06669471..c49799a1 100644
--- a/init.d/syscons.in
+++ b/init.d/syscons.in
@@ -4,7 +4,7 @@
 
 depend() {
 	need localmount
-	keyword -jail -prefix
+	keyword -jail
 }
 
 start() {
diff --git a/init.d/sysctl.BSD.in b/init.d/sysctl.BSD.in
index 89df6dca..4a86f878 100644
--- a/init.d/sysctl.BSD.in
+++ b/init.d/sysctl.BSD.in
@@ -5,7 +5,6 @@
 depend()
 {
 	before bootmisc logger
-	keyword -prefix
 }
 
 start()
diff --git a/init.d/sysctl.Linux.in b/init.d/sysctl.Linux.in
index 71932fef..0584c628 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 -vserver
 }
 
 start()
diff --git a/init.d/sysfs.in b/init.d/sysfs.in
index e6921985..e8567756 100644
--- a/init.d/sysfs.in
+++ b/init.d/sysfs.in
@@ -6,7 +6,7 @@ description="Mount the sys filesystem."
 
 depend()
 {
-	keyword -prefix -vserver
+	keyword -vserver
 }
 
 mount_sys()
diff --git a/init.d/syslogd.in b/init.d/syslogd.in
index 817afa1a..809ac891 100644
--- a/init.d/syslogd.in
+++ b/init.d/syslogd.in
@@ -16,5 +16,4 @@ depend()
 	use net newsyslog
 	need localmount
 	after bootmisc
-	keyword -prefix
 }
diff --git a/init.d/termencoding.in b/init.d/termencoding.in
index c8ea167d..5f09c985 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 -openvz -prefix -uml -vserver -xenu
+	keyword -openvz -uml -vserver -xenu
 	use root
 	after bootmisc
 }
diff --git a/init.d/ttys.in b/init.d/ttys.in
index 2adbe812..2ac524b5 100644
--- a/init.d/ttys.in
+++ b/init.d/ttys.in
@@ -5,7 +5,6 @@
 depend()
 {
 	after fsck
-	keyword -prefix
 }
 
 start()
diff --git a/init.d/urandom.in b/init.d/urandom.in
index bc48066b..8ee32517 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 -openvz -prefix
+	keyword -jail -openvz
 }
 
 save_seed()
diff --git a/init.d/wscons.in b/init.d/wscons.in
index 5d94eff1..9416b3b6 100644
--- a/init.d/wscons.in
+++ b/init.d/wscons.in
@@ -5,7 +5,6 @@
 depend()
 {
 	need localmount
-	keyword -prefix
 }
 
 start()
diff --git a/man/runscript.8 b/man/runscript.8
index bab54e2d..3b037ce7 100644
--- a/man/runscript.8
+++ b/man/runscript.8
@@ -175,8 +175,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 -uml
 Same as -jail, but for UML systems.
 .It Dv -vserver
@@ -385,9 +383,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="!noprefix"
+# It's also possible to negate keywords.
+rc_keyword="-keyword"
 .Ed
 .Sh EXAMPLES
 .Pp
diff --git a/runlevels/Makefile b/runlevels/Makefile
index 1573572e..468a3753 100644
--- a/runlevels/Makefile
+++ b/runlevels/Makefile
@@ -41,34 +41,24 @@ install:
 	if ! test -d "${SYSINITDIR}"; then \
 		${INSTALL} -d ${SYSINITDIR} || exit $$?; \
 		for x in ${SYSINIT}; do \
-			if test -n "${PREFIX}"; then \
-				grep -q "keyword .*noprefix" ${INITDIR}/"$$x" && continue; \
-			fi; \
-			ln -snf ${PREFIX}/etc/init.d/"$$x" ${SYSINITDIR}/"$$x" || exit $$?; done \
+			ln -snf ${PREFIX}/etc/init.d/"$$x" ${SYSINITDIR}/"$$x" || exit $$?; \
+		done \
 	fi
 	if ! test -d "${BOOTDIR}"; then \
 		${INSTALL} -d ${BOOTDIR} || exit $$?; \
 		for x in ${BOOT}; do \
-			if test -n "${PREFIX}"; then \
-				grep -q "keyword .*noprefix" ${INITDIR}/"$$x" && continue; \
-			fi; \
 			ln -snf ${PREFIX}/etc/init.d/"$$x" ${BOOTDIR}/"$$x" || exit $$?; \
 		done \
 	fi
 	if ! test -d "${DEFAULTDIR}"; then \
 		${INSTALL} -d ${DEFAULTDIR} || exit $$?; \
 		for x in ${DEFAULT}; do \
-			if test -n "${PREFIX}"; then \
-				grep -q "keyword .*noprefix" ${INITDIR}/"$$x" && continue; \
-			fi; \
-			ln -snf ${PREFIX}/etc/init.d/"$$x" ${DEFAULTDIR}/"$$x" || exit $$?; done \
+			ln -snf ${PREFIX}/etc/init.d/"$$x" ${DEFAULTDIR}/"$$x" || exit $$?; \
+		done \
 	fi
 	if ! test -d "${SHUTDOWNDIR}"; then \
 		${INSTALL} -d ${SHUTDOWNDIR} || exit $$?; \
 		for x in ${SHUTDOWN}; do \
-			if test -n "${PREFIX}"; then \
-				grep -q "keyword .*noprefix" ${INITDIR}/"$$x" && continue; \
-			fi; \
 			ln -snf ${PREFIX}/etc/init.d/"$$x" ${SHUTDOWNDIR}/"$$x" || exit $$?; done \
 	fi
 
diff --git a/src/librc/librc.c b/src/librc/librc.c
index d82880fb..ed601964 100644
--- a/src/librc/librc.c
+++ b/src/librc/librc.c
@@ -216,7 +216,6 @@ rc_sys_v2(void)
 		}
 		/* Now do detection */
 		__STRING_SWITCH(systype)
-		__STRING_CASE(RC_SYS_PREFIX)	{ return RC_SYS_PREFIX; }
 #ifdef __FreeBSD__
 		__STRING_CASE(RC_SYS_JAIL) { return RC_SYS_JAIL; }
 #endif /* __FreeBSD__ */
@@ -246,10 +245,6 @@ librc_hidden_def(rc_sys_v2)
 const char *
 rc_sys_v1(void)
 {
-#ifdef PREFIX
-	return RC_SYS_PREFIX;
-#else
-
 #ifdef __FreeBSD__
 	int jailed = 0;
 	size_t len = sizeof(jailed);
@@ -286,7 +281,6 @@ rc_sys_v1(void)
 #endif
 
 	return NULL;
-#endif /* PREFIX */
 }
 librc_hidden_def(rc_sys_v1)
 
diff --git a/src/librc/rc.h.in b/src/librc/rc.h.in
index 31b21f16..468990ee 100644
--- a/src/librc/rc.h.in
+++ b/src/librc/rc.h.in
@@ -276,7 +276,6 @@ bool rc_service_daemons_crashed(const char *);
 #define RC_SYS_JAIL    "JAIL"
 #define RC_SYS_OPENVZ  "OPENVZ"
 #define RC_SYS_LXC     "LXC"
-#define RC_SYS_PREFIX  "PREFIX"
 #define RC_SYS_UML     "UML"
 #define RC_SYS_VSERVER "VSERVER"
 #define RC_SYS_XEN0    "XEN0"