remove -prefix keyword from service scripts

williamh · williamh · commit b76b3b272cb0 · 2024-04-02T09:15:20.000-05:00
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -15,7 +15,6 @@ depend()
 {
 	after clock
 	need localmount
-	keyword -prefix
 }
 
 start()
diff --git 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
diff --git a/init.d/ttys.in b/init.d/ttys.in
diff --git a/init.d/urandom.in b/init.d/urandom.in
diff --git a/init.d/wscons.in b/init.d/wscons.in

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ depend()`
`30`	`30`	`[ "$clock" != "UTC" -a ! -e /etc/wall_cmos_clock ]; then`
`31`	`31`	`need root`
`32`	`32`	`fi`
`33`		`- keyword -jail -prefix`
	`33`	`+ keyword -jail`
`34`	`34`	`}`
`35`	`35`
`36`	`36`	`start()`
Original file line number	Diff line number	Diff line change
`@@ -20,7 +20,6 @@ pidfile="/run/${RC_SVCNAME}.pid"`
`20`	`20`
`21`	`21`	`depend() {`
`22`	`22`	`after local`
`23`		`- keyword -prefix`
`24`	`23`	`provide getty`
`25`	`24`	`}`
`26`	`25`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ depend()`
`15`	`15`	`{`
`16`	`16`	`after clock procfs`
`17`	`17`	`use modules devfs`
`18`		`- keyword -docker -lxc -openvz -prefix -systemd-nspawn -vserver`
	`18`	`+ keyword -docker -lxc -openvz -systemd-nspawn -vserver`
`19`	`19`	`}`
`20`	`20`
`21`	`21`	`start()`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ depend()`
`14`	`14`	`need localmount`
`15`	`15`	`before logger`
`16`	`16`	`after clock root sysctl`
`17`		`- keyword -prefix -timeout`
	`17`	`+ keyword -timeout`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`: ${wipe_tmp:=${WIPE_TMP:-yes}}`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@ description="Mount the control groups."`
`15`	`15`
`16`	`16`	`depend()`
`17`	`17`	`{`
`18`		`- keyword -docker -prefix -systemd-nspawn -vserver`
	`18`	`+ keyword -docker -systemd-nspawn -vserver`
`19`	`19`	`after sysfs`
`20`	`20`	`}`
`21`	`21`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ depend() {`
`17`	`17`	`need localmount`
`18`	`18`	`after bootmisc`
`19`	`19`	`before net.lo0`
`20`		`- keyword -jail -prefix`
	`20`	`+ keyword -jail`
`21`	`21`	`}`
`22`	`22`
`23`	`23`	`start_pre() {`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ description="Set the dmesg level for a cleaner boot"`
`14`	`14`	`depend()`
`15`	`15`	`{`
`16`	`16`	`before dev modules`
`17`		`- keyword -docker -lxc -prefix -systemd-nspawn -vserver`
	`17`	`+ keyword -docker -lxc -systemd-nspawn -vserver`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`start()`
Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ description="Configures a specific kernel dump device."`
`14`	`14`	`depend() {`
`15`	`15`	`after clock`
`16`	`16`	`need swap`
`17`		`- keyword -jail -prefix`
	`17`	`+ keyword -jail`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`start() {`