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.
2012-01-25 11:42:32 -06:00
parent 32c506a4c8
commit 3247184d86
49 changed files with 43 additions and 82 deletions
--- 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()
--- 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}}
--- 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()
--- 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() {
--- 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() {
--- 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() {
--- 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() {
--- 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()
--- 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()
--- 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()
--- 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()
--- 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"
--- 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()
--- 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()
--- 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()
--- 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()
--- 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()
--- 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()
--- 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;;
--- 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()
--- 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()
--- 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()
--- 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()
--- 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()
--- 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()
--- 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()
--- 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()
--- 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()
--- 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()
--- 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()
--- 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()
--- 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()
--- 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
--- a/init.d/syscons.in
+++ b/init.d/syscons.in
@@ -4,7 +4,7 @@

 depend() {
 	need localmount
-	keyword -jail -prefix
+	keyword -jail
 }

 start() {
--- a/init.d/sysctl.BSD.in
+++ b/init.d/sysctl.BSD.in
@@ -5,7 +5,6 @@
 depend()
 {
 	before bootmisc logger
-	keyword -prefix
 }

 start()
--- 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()
--- 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()
--- a/init.d/syslogd.in
+++ b/init.d/syslogd.in
@@ -16,5 +16,4 @@ depend()
 	use net newsyslog
 	need localmount
 	after bootmisc
-	keyword -prefix
 }
--- 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
 }
--- a/init.d/ttys.in
+++ b/init.d/ttys.in
@@ -5,7 +5,6 @@
 depend()
 {
 	after fsck
-	keyword -prefix
 }

 start()
--- 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()
--- a/init.d/wscons.in
+++ b/init.d/wscons.in
@@ -5,7 +5,6 @@
 depend()
 {
 	need localmount
-	keyword -prefix
 }

 start()