Remove the requirement for the FreeBSD keyword as it no longer

makes any sense.

Discussed with: dougb, brooks
MFC after: 3 days
This commit is contained in:
Mike Makonnen 2004-10-07 13:55:26 +00:00
parent e897f51327
commit 337338ee00
132 changed files with 92 additions and 134 deletions

2
etc/rc
View File

@ -68,7 +68,7 @@ fi
os=`eval ${CMD_OSTYPE}`
skip="-s nostart"
[ `/sbin/sysctl -n security.jail.jailed` -eq 1 ] && skip="$skip -s nojail"
files=`rcorder -k ${os} ${skip} /etc/rc.d/* 2>/dev/null`
files=`rcorder ${skip} /etc/rc.d/* 2>/dev/null`
for _rc_elem in ${files}; do
run_rc_script ${_rc_elem} ${_boot}

View File

@ -6,7 +6,6 @@
# PROVIDE: DAEMON
# REQUIRE: NETWORKING SERVERS
# KEYWORD: FreeBSD
# This is a dummy dependency, to ensure that general purpose daemons
# are run _after_ the above are.

View File

@ -6,7 +6,6 @@
# PROVIDE: LOGIN
# REQUIRE: DAEMON
# KEYWORD: FreeBSD
# This is a dummy dependency to ensure user services such as xdm,
# inetd, cron and kerberos are started after everything else, in case

View File

@ -7,7 +7,6 @@
# PROVIDE: NETWORKING NETWORK
# REQUIRE: dhclient netif routing network_ipv6 isdnd ppp-user
# REQUIRE: routed mrouted route6d mroute6d
# KEYWORD: FreeBSD
# This is a dummy dependency, for services which require networking
# to be operational before starting.

View File

@ -6,7 +6,6 @@
# PROVIDE: SERVERS
# REQUIRE: mountcritremote
# KEYWORD: FreeBSD
# This is a dummy dependency, for early-start servers relying on
# some basic configuration.

View File

@ -6,7 +6,7 @@
# PROVIDE: abi
# REQUIRE: LOGIN
# BEFORE: securelevel
# KEYWORD: FreeBSD nojail
# KEYWORD: nojail
. /etc/rc.subr

View File

@ -7,7 +7,7 @@
# PROVIDE: accounting
# REQUIRE: mountcritremote
# BEFORE: DAEMON
# KEYWORD: FreeBSD nojail
# KEYWORD: nojail
. /etc/rc.subr

View File

@ -8,7 +8,7 @@
# PROVIDE: addswap
# REQUIRE: mountcritlocal
# BEFORE: sysctl
# KEYWORD: FreeBSD nojail
# KEYWORD: nojail
. /etc/rc.subr

View File

@ -6,7 +6,7 @@
# PROVIDE: adjkerntz
# REQUIRE: mountcritlocal random
# BEFORE: netif
# KEYWORD: FreeBSD nojail
# KEYWORD: nojail
. /etc/rc.subr

View File

@ -7,7 +7,7 @@
# PROVIDE: amd
# REQUIRE: rpcbind ypbind nfsclient
# BEFORE: DAEMON
# KEYWORD: FreeBSD nojail
# KEYWORD: nojail
. /etc/rc.subr

View File

@ -6,7 +6,7 @@
# PROVIDE: apm
# REQUIRE: DAEMON
# BEFORE: LOGIN
# KEYWORD: FreeBSD nojail
# KEYWORD: nojail
. /etc/rc.subr

View File

@ -7,7 +7,7 @@
# PROVIDE: apmd
# REQUIRE: DAEMON apm
# BEFORE: LOGIN
# KEYWORD: FreeBSD nojail
# KEYWORD: nojail
. /etc/rc.subr

View File

@ -6,7 +6,7 @@
# PROVIDE: archdep
# REQUIRE: LOGIN
# BEFORE: abi
# KEYWORD: FreeBSD nojail
# KEYWORD: nojail
. /etc/rc.subr

View File

@ -30,7 +30,7 @@
# PROVIDE: atm1
# REQUIRE: root
# BEFORE: netif
# KEYWORD: FreeBSD nojail
# KEYWORD: nojail
. /etc/rc.subr

View File

@ -30,7 +30,7 @@
# PROVIDE: atm2
# REQUIRE: atm1 netif
# BEFORE: routing
# KEYWORD: FreeBSD nojail
# KEYWORD: nojail
#
# Additional ATM interface configuration

View File

@ -32,7 +32,7 @@
# PROVIDE: atm3
# REQUIRE: atm2
# BEFORE: DAEMON
# KEYWORD: FreeBSD nojail
# KEYWORD: nojail
. /etc/rc.subr

View File

@ -5,7 +5,7 @@
# PROVIDE: bgfsck
# REQUIRE: cron devfs
# KEYWORD: FreeBSD nojail
# KEYWORD: nojail
. /etc/rc.subr

View File

@ -7,7 +7,7 @@
# PROVIDE: bootparams
# REQUIRE: rpcbind DAEMON
# BEFORE: LOGIN
# KEYWORD: FreeBSD nojail
# KEYWORD: nojail
. /etc/rc.subr

View File

@ -5,7 +5,7 @@
#
# PROVIDE: disks
# KEYWORD: FreeBSD nojail
# KEYWORD: nojail
. /etc/rc.subr

View File

@ -5,7 +5,6 @@
# PROVIDE: cleanvar
# REQUIRE: mountcritlocal var
# KEYWORD: FreeBSD
purgedir()
{

View File

@ -7,7 +7,6 @@
# PROVIDE: cleartmp
# REQUIRE: mountcritremote tmp
# BEFORE: DAEMON
# KEYWORD: FreeBSD
. /etc/rc.subr

View File

@ -7,7 +7,7 @@
# PROVIDE: cron
# REQUIRE: LOGIN
# BEFORE: securelevel
# KEYWORD: FreeBSD shutdown
# KEYWORD: shutdown
. /etc/rc.subr

View File

@ -6,7 +6,7 @@
# PROVIDE: devd
# REQUIRE: NETWORKING
# BEFORE: mountcritremote
# KEYWORD: FreeBSD nojail
# KEYWORD: nojail
. /etc/rc.subr

View File

@ -6,7 +6,7 @@
# PROVIDE: devfs
# REQUIRE: LOGIN
# BEFORE: securelevel
# KEYWORD: FreeBSD nojail
# KEYWORD: nojail
. /etc/rc.subr

View File

@ -7,7 +7,7 @@
# PROVIDE: dhclient
# REQUIRE: netif ipfw ipfilter mountcritlocal
# BEFORE: NETWORKING
# KEYWORD: FreeBSD nojail
# KEYWORD: nojail
#
# Note that there no syslog logging of dhclient messages at boot because
# dhclient needs to start before services that syslog depends upon do.

View File

@ -7,7 +7,7 @@
# PROVIDE: dmesg
# REQUIRE: mountcritremote
# BEFORE: DAEMON
# KEYWORD: FreeBSD Daemon nojail
# KEYWORD: Daemon nojail
. /etc/rc.subr

View File

@ -6,7 +6,7 @@
# PROVIDE: dumpon
# REQUIRE: initrandom
# BEFORE: disks savecore
# KEYWORD: FreeBSD nojail
# KEYWORD: nojail
. /etc/rc.subr

View File

@ -6,7 +6,6 @@
# PROVIDE: early
# REQUIRE: disks localswap
# BEFORE: fsck
# KEYWORD: FreeBSD
#
# Support for legacy /etc/rc.early script

View File

@ -5,7 +5,7 @@
# PROVIDE: disks
# REQUIRE: initrandom
# KEYWORD: FreeBSD nojail
# KEYWORD: nojail
. /etc/rc.subr

View File

@ -6,7 +6,7 @@
# PROVIDE: fsck
# REQUIRE: localswap
# KEYWORD: FreeBSD nojail
# KEYWORD: nojail
. /etc/rc.subr

View File

@ -7,7 +7,7 @@
#
# PROVIDE: disks
# KEYWORD: FreeBSD nojail
# KEYWORD: nojail
. /etc/rc.subr

View File

@ -5,7 +5,7 @@
# PROVIDE: disks
# REQUIRE: initrandom
# KEYWORD: FreeBSD nojail
# KEYWORD: nojail
. /etc/rc.subr

View File

@ -29,7 +29,6 @@
# PROVIDE: hostname
# REQUIRE: mountcritlocal
# BEFORE: netif
# KEYWORD: FreeBSD
. /etc/rc.subr

View File

@ -6,7 +6,7 @@
# PROVIDE: ike
# REQUIRE: root mountcritlocal
# BEFORE: DAEMON
# KEYWORD: FreeBSD nojail
# KEYWORD: nojail
. /etc/rc.subr

View File

@ -6,7 +6,7 @@
# PROVIDE: inetd
# REQUIRE: DAEMON LOGIN
# KEYWORD: FreeBSD shutdown
# KEYWORD: shutdown
. /etc/rc.subr

View File

@ -28,7 +28,7 @@
#
# REQUIRE: preseedrandom
# PROVIDE: initdiskless
# KEYWORD: FreeBSD nojail
# KEYWORD: nojail
# BEFORE: ipfw

View File

@ -6,7 +6,7 @@
# PROVIDE: initrandom
# REQUIRE: initdiskless
# BEFORE: disks
# KEYWORD: FreeBSD nojail
# KEYWORD: nojail
. /etc/rc.subr

View File

@ -6,7 +6,7 @@
# PROVIDE: ip6addrctl
# REQUIRE: mountcritlocal netif
# BEFORE: network_ipv6
# KEYWORD: FreeBSD nojail
# KEYWORD: nojail
. /etc/rc.subr

View File

@ -6,7 +6,7 @@
# PROVIDE: ip6fw
# REQUIRE: routing
# BEFORE: network_ipv6
# KEYWORD: FreeBSD nojail
# KEYWORD: nojail
. /etc/rc.subr

View File

@ -7,7 +7,7 @@
# PROVIDE: ipfilter
# REQUIRE: root mountcritlocal
# BEFORE: netif
# KEYWORD: FreeBSD nojail
# KEYWORD: nojail
. /etc/rc.subr

View File

@ -7,7 +7,7 @@
# PROVIDE: ipfs
# REQUIRE: ipnat
# BEFORE: netif
# KEYWORD: FreeBSD nojail shutdown
# KEYWORD: nojail shutdown
. /etc/rc.subr

View File

@ -6,7 +6,7 @@
# PROVIDE: ipfw
# REQUIRE: ppp-user
# BEFORE: NETWORKING
# KEYWORD: FreeBSD nojail
# KEYWORD: nojail
. /etc/rc.subr
. /etc/network.subr

View File

@ -7,7 +7,7 @@
# PROVIDE: ipmon
# REQUIRE: mountcritlocal hostname sysctl cleanvar ipfilter
# BEFORE: SERVERS
# KEYWORD: FreeBSD nojail
# KEYWORD: nojail
. /etc/rc.subr

View File

@ -7,7 +7,7 @@
# PROVIDE: ipnat
# REQUIRE: ipfilter
# BEFORE: DAEMON netif
# KEYWORD: FreeBSD nojail
# KEYWORD: nojail
. /etc/rc.subr

View File

@ -7,7 +7,7 @@
# PROVIDE: ipsec
# REQUIRE: root mountcritlocal
# BEFORE: DAEMON
# KEYWORD: FreeBSD nojail
# KEYWORD: nojail
# it does not really require beforenetlkm.

View File

@ -6,7 +6,7 @@
# PROVIDE: ipxrouted
# REQUIRE: SERVERS
# BEFORE: DAEMON
# KEYWORD: FreeBSD nojail
# KEYWORD: nojail
. /etc/rc.subr

View File

@ -8,7 +8,7 @@
# PROVIDE: isdnd
# REQUIRE: netif mountcritlocal
# KEYWORD: FreeBSD nojail
# KEYWORD: nojail
. /etc/rc.subr

View File

@ -6,7 +6,7 @@
# PROVIDE: jail
# REQUIRE: LOGIN
# BEFORE: securelevel
# KEYWORD: FreeBSD nojail shutdown
# KEYWORD: nojail shutdown
. /etc/rc.subr

View File

@ -6,7 +6,6 @@
# PROVIDE: kadmin
# REQUIRE: kerberos
# BEFORE: DAEMON
# KEYWORD: FreeBSD
. /etc/rc.subr

View File

@ -5,7 +5,6 @@
# PROVIDE: kerberos
# REQUIRE: NETWORKING
# KEYWORD: FreeBSD
. /etc/rc.subr

View File

@ -9,7 +9,6 @@
# PROVIDE: keyserv
# REQUIRE: ypbind
# BEFORE: DAEMON
# KEYWORD: FreeBSD
. /etc/rc.subr

View File

@ -6,7 +6,7 @@
# PROVIDE: kldxref
# REQUIRE: root mountcritlocal
# BEFORE: netif
# KEYWORD: FreeBSD nojail
# KEYWORD: nojail
. /etc/rc.subr

View File

@ -6,7 +6,6 @@
# PROVIDE: kpasswdd
# REQUIRE: kadmin
# BEFORE: DAEMON
# KEYWORD: FreeBSD
. /etc/rc.subr

View File

@ -7,7 +7,6 @@
# PROVIDE: ldconfig
# REQUIRE: mountcritremote
# BEFORE: DAEMON
# KEYWORD: FreeBSD
. /etc/rc.subr

View File

@ -7,7 +7,7 @@
# PROVIDE: local
# REQUIRE: DAEMON
# BEFORE: LOGIN
# KEYWORD: FreeBSD shutdown
# KEYWORD: shutdown
. /etc/rc.subr

View File

@ -6,7 +6,7 @@
# PROVIDE: localpkg
# REQUIRE: abi
# BEFORE: securelevel
# KEYWORD: FreeBSD shutdown
# KEYWORD: shutdown
. /etc/rc.subr

View File

@ -7,7 +7,7 @@
# PROVIDE: nfslocking
# REQUIRE: nfsserver nfsclient nfsd
# BEFORE: DAEMON
# KEYWORD: FreeBSD nojail
# KEYWORD: nojail
. /etc/rc.subr

View File

@ -6,7 +6,7 @@
# PROVIDE: lomac
# REQUIRE: mountcritremote
# BEFORE: syslogd
# KEYWORD: FreeBSD nojail
# KEYWORD: nojail
. /etc/rc.subr

View File

@ -7,7 +7,6 @@
# PROVIDE: lpd
# REQUIRE: DAEMON
# BEFORE: LOGIN
# KEYWORD: FreeBSD
. /etc/rc.subr

View File

@ -29,7 +29,7 @@
# PROVIDE: mixer
# REQUIRE: LOGIN usbd
# KEYWORD: FreeBSD nojail shutdown
# KEYWORD: nojail shutdown
. /etc/rc.subr

View File

@ -7,7 +7,6 @@
# PROVIDE: motd
# REQUIRE: mountcritremote
# BEFORE: LOGIN
# KEYWORD: FreeBSD
. /etc/rc.subr

View File

@ -6,7 +6,7 @@
# PROVIDE: mountcritlocal
# REQUIRE: root
# KEYWORD: FreeBSD nojail
# KEYWORD: nojail
. /etc/rc.subr

View File

@ -6,7 +6,7 @@
# PROVIDE: mountcritremote
# REQUIRE: NETWORKING root mountcritlocal
# KEYWORD: FreeBSD nojail
# KEYWORD: nojail
. /etc/rc.subr

View File

@ -6,7 +6,7 @@
# PROVIDE: mountd
# REQUIRE: NETWORKING nfsserver rpcbind quota
# KEYWORD: FreeBSD nojail
# KEYWORD: nojail
. /etc/rc.subr

View File

@ -6,7 +6,7 @@
# PROVIDE: moused
# REQUIRE: DAEMON
# KEYWORD: FreeBSD nojail
# KEYWORD: nojail
. /etc/rc.subr

View File

@ -5,7 +5,7 @@
# PROVIDE: mroute6d
# REQUIRE: network_ipv6
# KEYWORD: FreeBSD nojail
# KEYWORD: nojail
. /etc/rc.subr

View File

@ -6,7 +6,7 @@
# PROVIDE: mrouted
# REQUIRE: netif routing
# KEYWORD: FreeBSD nojail
# KEYWORD: nojail
. /etc/rc.subr

View File

@ -5,7 +5,6 @@
# PROVIDE: msgs
# REQUIRE: LOGIN
# KEYWORD: FreeBSD
# Make a bounds file for msgs(1) if there isn't one already
#

View File

@ -7,7 +7,6 @@
# PROVIDE: named
# REQUIRE: SERVERS
# BEFORE: DAEMON
# KEYWORD: FreeBSD
. /etc/rc.subr

View File

@ -4,7 +4,7 @@
#
# PROVIDE: natd
# KEYWORD: FreeBSD nostart nojail
# KEYWORD: nostart nojail
. /etc/rc.subr
. /etc/network.subr

View File

@ -27,7 +27,7 @@
# PROVIDE: netif
# REQUIRE: atm1 ipfilter mountcritlocal pccard serial sppp sysctl
# KEYWORD: FreeBSD nojail
# KEYWORD: nojail
. /etc/rc.subr
. /etc/network.subr

View File

@ -6,7 +6,7 @@
# PROVIDE: netoptions
# REQUIRE: localpkg
# BEFORE: securelevel
# KEYWORD: FreeBSD nojail
# KEYWORD: nojail
. /etc/rc.subr

View File

@ -30,7 +30,7 @@
# PROVIDE: network_ipv6
# REQUIRE: routing
# KEYWORD: FreeBSD nojail
# KEYWORD: nojail
. /etc/rc.subr
. /etc/network.subr

View File

@ -5,7 +5,7 @@
# PROVIDE: nfsclient
# REQUIRE: NETWORKING mountcritremote rpcbind
# KEYWORD: FreeBSD nojail shutdown
# KEYWORD: nojail shutdown
. /etc/rc.subr

View File

@ -6,7 +6,7 @@
# PROVIDE: nfsd
# REQUIRE: mountd
# KEYWORD: FreeBSD nojail
# KEYWORD: nojail
. /etc/rc.subr

View File

@ -7,7 +7,7 @@
# PROVIDE: nfslocking
# REQUIRE: nfsserver nfsclient nfsd
# BEFORE: DAEMON
# KEYWORD: FreeBSD nojail
# KEYWORD: nojail
. /etc/rc.subr

View File

@ -5,7 +5,7 @@
# PROVIDE: nfsserver
# REQUIRE: NETWORKING mountcritremote
# KEYWORD: FreeBSD nojail
# KEYWORD: nojail
. /etc/rc.subr

View File

@ -29,7 +29,6 @@
# PROVIDE: nisdomain
# REQUIRE: SERVERS rpcbind
# BEFORE: ypbind ypserv ypxfrd
# KEYWORD: FreeBSD
. /etc/rc.subr

View File

@ -29,7 +29,6 @@
# PROVIDE: nsswitch
# REQUIRE: root
# BEFORE: NETWORK
# KEYWORD: FreeBSD
. /etc/rc.subr

View File

@ -7,7 +7,7 @@
# PROVIDE: ntpd
# REQUIRE: DAEMON
# BEFORE: LOGIN
# KEYWORD: FreeBSD nojail
# KEYWORD: nojail
. /etc/rc.subr

View File

@ -7,7 +7,7 @@
# BEFORE: ntpd
# PROVIDE: ntpdate
# REQUIRE: NETWORKING syslogd
# KEYWORD: FreeBSD nojail
# KEYWORD: nojail
. /etc/rc.subr

View File

@ -5,7 +5,6 @@
# PROVIDE: mail
# REQUIRE: LOGIN
# KEYWORD: FreeBSD
# XXX - TEMPORARY SCRIPT UNTIL YOU WRITE YOUR OWN REPLACEMENT.
#

View File

@ -29,7 +29,7 @@
# PROVIDE: pccard
# REQUIRE: mountcritlocal
# KEYWORD: FreeBSD nojail
# KEYWORD: nojail
. /etc/rc.subr

View File

@ -29,7 +29,7 @@
# PROVIDE: pcvt
# REQUIRE: LOGIN
# KEYWORD: FreeBSD nojail
# KEYWORD: nojail
. /etc/rc.subr

View File

@ -6,7 +6,7 @@
# PROVIDE: pf
# REQUIRE: root mountcritlocal netif pflog
# BEFORE: DAEMON LOGIN
# KEYWORD: FreeBSD nojail
# KEYWORD: nojail
. /etc/rc.subr

View File

@ -6,7 +6,7 @@
# PROVIDE: pflog
# REQUIRE: root mountcritlocal netif
# BEFORE: DAEMON LOGIN
# KEYWORD: FreeBSD nojail
# KEYWORD: nojail
. /etc/rc.subr

View File

@ -9,7 +9,7 @@
#
# PROVIDE: power_profile
# KEYWORD: FreeBSD nojail nostart
# KEYWORD: nojail nostart
. /etc/rc.subr

View File

@ -5,7 +5,7 @@
# PROVIDE: ppp-user
# REQUIRE: netif isdnd
# KEYWORD: FreeBSD nojail
# KEYWORD: nojail
. /etc/rc.subr

View File

@ -5,7 +5,7 @@
# PROVIDE: ppp-user
# REQUIRE: netif isdnd
# KEYWORD: FreeBSD nojail
# KEYWORD: nojail
. /etc/rc.subr

View File

@ -6,7 +6,7 @@
# PROVIDE: pppoed
# REQUIRE: NETWORKING
# BEFORE: DAEMON
# KEYWORD: FreeBSD nojail
# KEYWORD: nojail
. /etc/rc.subr

View File

@ -4,7 +4,7 @@
#
# PROVIDE: preseedrandom
# KEYWORD: FreeBSD nojail
# KEYWORD: nojail
feed_dev_random()
{

View File

@ -7,7 +7,6 @@
# PROVIDE: pwcheck
# REQUIRE: mountcritremote syslogd
# BEFORE: DAEMON
# KEYWORD: FreeBSD
. /etc/rc.subr

View File

@ -9,7 +9,7 @@
# PROVIDE: quota
# REQUIRE: mountcritremote
# BEFORE: DAEMON
# KEYWORD: FreeBSD nojail
# KEYWORD: nojail
. /etc/rc.subr

View File

@ -30,7 +30,6 @@
# PROVIDE: ramdisk
# REQUIRE: localswap
# BEFORE: mountcritlocal
# KEYWORD: FreeBSD
. /etc/rc.subr

View File

@ -30,7 +30,6 @@
# PROVIDE: ramdisk-own
# REQUIRE: ramdisk mountcritlocal
# BEFORE: SERVERS
# KEYWORD: FreeBSD
. /etc/rc.subr

View File

@ -6,7 +6,7 @@
# PROVIDE: random
# REQUIRE: var initrandom
# BEFORE: netif
# KEYWORD: FreeBSD nojail shutdown
# KEYWORD: nojail shutdown
. /etc/rc.subr

View File

@ -7,7 +7,7 @@
# PROVIDE: rarpd
# REQUIRE: DAEMON
# BEFORE: LOGIN
# KEYWORD: FreeBSD nojail
# KEYWORD: nojail
. /etc/rc.subr

View File

@ -6,7 +6,6 @@
# PROVIDE: rcconf
# REQUIRE: initdiskless
# BEFORE: disks initrandom
# KEYWORD: FreeBSD
. /etc/rc.subr

View File

@ -29,7 +29,7 @@
# PROVIDE: resolv
# REQUIRE: initdiskless rcconf
# KEYWORD: FreeBSD nojail
# KEYWORD: nojail
. /etc/rc.subr

View File

@ -6,7 +6,7 @@
# PROVIDE: root
# REQUIRE: fsck
# KEYWORD: FreeBSD nojail
# KEYWORD: nojail
. /etc/rc.subr

Some files were not shown because too many files have changed in this diff Show More