Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

remove remaining gentoo prefix references #697

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
remove -prefix keyword from service scripts
williamh committed Apr 2, 2024
commit b76b3b272cb03c9755027e29c15658aeee824589
2 changes: 1 addition & 1 deletion init.d/adjkerntz.in
Original file line number Diff line number Diff line change
@@ -30,7 +30,7 @@ depend()
[ "$clock" != "UTC" -a ! -e /etc/wall_cmos_clock ]; then
need root
fi
keyword -jail -prefix
keyword -jail
}

start()
1 change: 0 additions & 1 deletion init.d/agetty.in
Original file line number Diff line number Diff line change
@@ -20,7 +20,6 @@ pidfile="/run/${RC_SVCNAME}.pid"

depend() {
after local
keyword -prefix
provide getty
}

2 changes: 1 addition & 1 deletion init.d/binfmt.in
Original file line number Diff line number Diff line change
@@ -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()
2 changes: 1 addition & 1 deletion init.d/bootmisc.in
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@ depend()
need localmount
before logger
after clock root sysctl
keyword -prefix -timeout
keyword -timeout
}

: ${wipe_tmp:=${WIPE_TMP:-yes}}
2 changes: 1 addition & 1 deletion init.d/cgroups.in
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@ description="Mount the control groups."

depend()
{
keyword -docker -prefix -systemd-nspawn -vserver
keyword -docker -systemd-nspawn -vserver
after sysfs
}

2 changes: 1 addition & 1 deletion init.d/consolefont.in
Original file line number Diff line number Diff line change
@@ -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()
2 changes: 1 addition & 1 deletion init.d/devd.in
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@ depend() {
need localmount
after bootmisc
before net.lo0
keyword -jail -prefix
keyword -jail
}

start_pre() {
2 changes: 1 addition & 1 deletion init.d/devfs.in
Original file line number Diff line number Diff line change
@@ -15,7 +15,7 @@ depend()
{
provide dev-mount
before dev
keyword -docker -prefix -systemd-nspawn -vserver
keyword -docker -systemd-nspawn -vserver
}

mount_dev()
2 changes: 1 addition & 1 deletion init.d/dmesg.in
Original file line number Diff line number Diff line change
@@ -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()
2 changes: 1 addition & 1 deletion init.d/dumpon.in
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@ description="Configures a specific kernel dump device."
depend() {
after clock
need swap
keyword -jail -prefix
keyword -jail
}

start() {
2 changes: 1 addition & 1 deletion init.d/fsck.in
Original file line number Diff line number Diff line change
@@ -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() {
2 changes: 1 addition & 1 deletion init.d/hostid.in
Original file line number Diff line number Diff line change
@@ -17,7 +17,7 @@ depend()
use root
after clock
before devd net
keyword -jail -prefix
keyword -jail
}

_set()
2 changes: 1 addition & 1 deletion init.d/hostname.in
Original file line number Diff line number Diff line change
@@ -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()
2 changes: 1 addition & 1 deletion init.d/hwclock.in
Original file line number Diff line number Diff line change
@@ -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()
2 changes: 1 addition & 1 deletion init.d/keymaps.in
Original file line number Diff line number Diff line change
@@ -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()
1 change: 0 additions & 1 deletion init.d/killprocs.in
Original file line number Diff line number Diff line change
@@ -13,7 +13,6 @@ description="Kill all processes so we can unmount disks cleanly."

depend()
{
keyword -prefix
}

start()
2 changes: 1 addition & 1 deletion init.d/localmount.in
Original file line number Diff line number Diff line change
@@ -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()
2 changes: 1 addition & 1 deletion init.d/loopback.in
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@ description="Configures the loopback interface."
depend()
{
after clock
keyword -jail -prefix -systemd-nspawn -vserver
keyword -jail -systemd-nspawn -vserver
}

start()
2 changes: 1 addition & 1 deletion init.d/mixer.in
Original file line number Diff line number Diff line change
@@ -14,7 +14,7 @@ extra_commands="restore"
depend()
{
need localmount
keyword -jail -prefix
keyword -jail
}

restore()
2 changes: 1 addition & 1 deletion init.d/modules.in
Original file line number Diff line number Diff line change
@@ -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()
2 changes: 1 addition & 1 deletion init.d/mount-ro.in
Original file line number Diff line number Diff line change
@@ -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()
2 changes: 1 addition & 1 deletion init.d/moused.in
Original file line number Diff line number Diff line change
@@ -23,7 +23,7 @@ depend()
{
need localmount
after bootmisc
keyword -jail -prefix
keyword -jail
}

start()
2 changes: 1 addition & 1 deletion init.d/mtab.in
Original file line number Diff line number Diff line change
@@ -16,7 +16,7 @@ depend()
after clock
before localmount
need root
keyword -prefix -systemd-nspawn
keyword -systemd-nspawn
}

start()
2 changes: 1 addition & 1 deletion init.d/net-online.in
Original file line number Diff line number Diff line change
@@ -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()
2 changes: 1 addition & 1 deletion init.d/netmount.in
Original file line number Diff line number Diff line change
@@ -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()
2 changes: 1 addition & 1 deletion init.d/network.in
Original file line number Diff line number Diff line change
@@ -22,7 +22,7 @@ depend()
if [ -n "$(interfaces)" ]; then
provide net
fi
keyword -jail -prefix -vserver
keyword -jail -vserver
}

uniqify()
1 change: 0 additions & 1 deletion init.d/newsyslog.in
Original file line number Diff line number Diff line change
@@ -15,7 +15,6 @@ depend()
{
after clock
need localmount
keyword -prefix
}

start()
2 changes: 1 addition & 1 deletion init.d/numlock.in
Original file line number Diff line number Diff line change
@@ -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()
2 changes: 1 addition & 1 deletion init.d/pf.in
Original file line number Diff line number Diff line change
@@ -18,7 +18,7 @@ extra_started_commands="reload"

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

start()
2 changes: 1 addition & 1 deletion init.d/powerd.in
Original file line number Diff line number Diff line change
@@ -19,7 +19,7 @@ depend()
need localmount
use logger
after bootmisc
keyword -jail -prefix
keyword -jail
}

start_pre()
2 changes: 1 addition & 1 deletion init.d/procfs.in
Original file line number Diff line number Diff line change
@@ -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()
1 change: 0 additions & 1 deletion init.d/rc-enabled.in
Original file line number Diff line number Diff line change
@@ -14,7 +14,6 @@ depend()
need localmount net
after *
before local
keyword -prefix
}

start()
2 changes: 1 addition & 1 deletion init.d/root.in
Original file line number Diff line number Diff line change
@@ -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()
2 changes: 1 addition & 1 deletion init.d/save-keymaps.in
Original file line number Diff line number Diff line change
@@ -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()
2 changes: 1 addition & 1 deletion init.d/save-termencoding.in
Original file line number Diff line number Diff line change
@@ -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
}
2 changes: 1 addition & 1 deletion init.d/savecore.in
Original file line number Diff line number Diff line change
@@ -16,7 +16,7 @@ depend()
need dumpon localmount
after clock
before encswap
keyword -jail -prefix
keyword -jail
}

start()
2 changes: 1 addition & 1 deletion init.d/seedrng.in
Original file line number Diff line number Diff line change
@@ -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
}

2 changes: 1 addition & 1 deletion init.d/staticroute.in
Original file line number Diff line number Diff line change
@@ -19,7 +19,7 @@ depend()
after clock
provide net
use network
keyword -jail -prefix -vserver
keyword -jail -vserver
}

pre_flight_checks()
2 changes: 1 addition & 1 deletion init.d/swap-blk.in
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@ depend()
{
after clock
before fsck
keyword -jail -prefix
keyword -jail
}

start()
2 changes: 1 addition & 1 deletion init.d/swap.in
Original file line number Diff line number Diff line change
@@ -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()
2 changes: 1 addition & 1 deletion init.d/swclock.in
Original file line number Diff line number Diff line change
@@ -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
2 changes: 1 addition & 1 deletion init.d/syscons.in
Original file line number Diff line number Diff line change
@@ -12,7 +12,7 @@
depend() {
after clock
need localmount
keyword -jail -prefix
keyword -jail
}

start() {
2 changes: 1 addition & 1 deletion init.d/sysctl.in
Original file line number Diff line number Diff line change
@@ -13,7 +13,7 @@ depend()
{
after clock
before bootmisc logger
keyword -prefix -systemd-nspawn -vserver
keyword -systemd-nspawn -vserver
}

BSD_sysctl()
2 changes: 1 addition & 1 deletion init.d/sysfs.in
Original file line number Diff line number Diff line change
@@ -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()
1 change: 0 additions & 1 deletion init.d/syslogd.in
Original file line number Diff line number Diff line change
@@ -23,5 +23,4 @@ depend()
use net newsyslog
need localmount
after bootmisc clock
keyword -prefix
}
Loading