From 337338ee009d6a396b8cd625d57f25f4269ed33d Mon Sep 17 00:00:00 2001 From: Mike Makonnen Date: Thu, 7 Oct 2004 13:55:26 +0000 Subject: Remove the requirement for the FreeBSD keyword as it no longer makes any sense. Discussed with: dougb, brooks MFC after: 3 days --- etc/rc | 2 +- etc/rc.d/DAEMON | 1 - etc/rc.d/LOGIN | 1 - etc/rc.d/NETWORKING | 1 - etc/rc.d/SERVERS | 1 - etc/rc.d/abi | 2 +- etc/rc.d/accounting | 2 +- etc/rc.d/addswap | 2 +- etc/rc.d/adjkerntz | 2 +- etc/rc.d/amd | 2 +- etc/rc.d/apm | 2 +- etc/rc.d/apmd | 2 +- etc/rc.d/archdep | 2 +- etc/rc.d/atm1 | 2 +- etc/rc.d/atm2 | 2 +- etc/rc.d/atm3 | 2 +- etc/rc.d/bgfsck | 2 +- etc/rc.d/bootparams | 2 +- etc/rc.d/ccd | 2 +- etc/rc.d/cleanvar | 1 - etc/rc.d/cleartmp | 1 - etc/rc.d/cron | 2 +- etc/rc.d/devd | 2 +- etc/rc.d/devfs | 2 +- etc/rc.d/dhclient | 2 +- etc/rc.d/dmesg | 2 +- etc/rc.d/dumpon | 2 +- etc/rc.d/early.sh | 1 - etc/rc.d/encswap | 2 +- etc/rc.d/fsck | 2 +- etc/rc.d/gbde | 2 +- etc/rc.d/gbde_swap | 2 +- etc/rc.d/hostname | 1 - etc/rc.d/ike | 2 +- etc/rc.d/inetd | 2 +- etc/rc.d/initdiskless | 2 +- etc/rc.d/initrandom | 2 +- etc/rc.d/ip6addrctl | 2 +- etc/rc.d/ip6fw | 2 +- etc/rc.d/ipfilter | 2 +- etc/rc.d/ipfs | 2 +- etc/rc.d/ipfw | 2 +- etc/rc.d/ipmon | 2 +- etc/rc.d/ipnat | 2 +- etc/rc.d/ipsec | 2 +- etc/rc.d/ipxrouted | 2 +- etc/rc.d/isdnd | 2 +- etc/rc.d/jail | 2 +- etc/rc.d/kadmind | 1 - etc/rc.d/kerberos | 1 - etc/rc.d/keyserv | 1 - etc/rc.d/kldxref | 2 +- etc/rc.d/kpasswdd | 1 - etc/rc.d/ldconfig | 1 - etc/rc.d/local | 2 +- etc/rc.d/localpkg | 2 +- etc/rc.d/lockd | 2 +- etc/rc.d/lomac | 2 +- etc/rc.d/lpd | 1 - etc/rc.d/mixer | 2 +- etc/rc.d/motd | 1 - etc/rc.d/mountcritlocal | 2 +- etc/rc.d/mountcritremote | 2 +- etc/rc.d/mountd | 2 +- etc/rc.d/moused | 2 +- etc/rc.d/mroute6d | 2 +- etc/rc.d/mrouted | 2 +- etc/rc.d/msgs | 1 - etc/rc.d/named | 1 - etc/rc.d/natd | 2 +- etc/rc.d/netif | 2 +- etc/rc.d/netoptions | 2 +- etc/rc.d/network_ipv6 | 2 +- etc/rc.d/nfsclient | 2 +- etc/rc.d/nfsd | 2 +- etc/rc.d/nfslocking | 2 +- etc/rc.d/nfsserver | 2 +- etc/rc.d/nisdomain | 1 - etc/rc.d/nsswitch | 1 - etc/rc.d/ntpd | 2 +- etc/rc.d/ntpdate | 2 +- etc/rc.d/othermta | 1 - etc/rc.d/pccard | 2 +- etc/rc.d/pcvt | 2 +- etc/rc.d/pf | 2 +- etc/rc.d/pflog | 2 +- etc/rc.d/power_profile | 2 +- etc/rc.d/ppp | 2 +- etc/rc.d/ppp-user | 2 +- etc/rc.d/pppoed | 2 +- etc/rc.d/preseedrandom | 2 +- etc/rc.d/pwcheck | 1 - etc/rc.d/quota | 2 +- etc/rc.d/ramdisk | 1 - etc/rc.d/ramdisk-own | 1 - etc/rc.d/random | 2 +- etc/rc.d/rarpd | 2 +- etc/rc.d/rcconf.sh | 1 - etc/rc.d/resolv | 2 +- etc/rc.d/root | 2 +- etc/rc.d/route6d | 2 +- etc/rc.d/routed | 2 +- etc/rc.d/routing | 2 +- etc/rc.d/rpcbind | 1 - etc/rc.d/rtadvd | 2 +- etc/rc.d/rwho | 1 - etc/rc.d/savecore | 2 +- etc/rc.d/securelevel | 1 - etc/rc.d/sendmail | 1 - etc/rc.d/serial | 2 +- etc/rc.d/sppp | 2 +- etc/rc.d/sshd | 1 - etc/rc.d/statd | 2 +- etc/rc.d/swap1 | 2 +- etc/rc.d/syscons | 2 +- etc/rc.d/sysctl | 1 - etc/rc.d/syslogd | 1 - etc/rc.d/timed | 2 +- etc/rc.d/tmp | 1 - etc/rc.d/usbd | 2 +- etc/rc.d/var | 1 - etc/rc.d/vinum | 2 +- etc/rc.d/virecover | 1 - etc/rc.d/watchdogd | 2 +- etc/rc.d/ypbind | 1 - etc/rc.d/yppasswdd | 1 - etc/rc.d/ypserv | 1 - etc/rc.d/ypset | 1 - etc/rc.d/ypupdated | 1 - etc/rc.d/ypxfrd | 1 - etc/rc.initdiskless | 2 +- etc/rc.shutdown | 4 +--- 132 files changed, 92 insertions(+), 134 deletions(-) diff --git a/etc/rc b/etc/rc index 9648cdbcd6f4..5915910ee34f 100644 --- a/etc/rc +++ b/etc/rc @@ -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} diff --git a/etc/rc.d/DAEMON b/etc/rc.d/DAEMON index 78db4df3c7ec..95413803018b 100755 --- a/etc/rc.d/DAEMON +++ b/etc/rc.d/DAEMON @@ -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. diff --git a/etc/rc.d/LOGIN b/etc/rc.d/LOGIN index ec690d9718ab..bf84a33fadcd 100755 --- a/etc/rc.d/LOGIN +++ b/etc/rc.d/LOGIN @@ -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 diff --git a/etc/rc.d/NETWORKING b/etc/rc.d/NETWORKING index 3cfb54cacafe..d74c0b13f081 100644 --- a/etc/rc.d/NETWORKING +++ b/etc/rc.d/NETWORKING @@ -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. diff --git a/etc/rc.d/SERVERS b/etc/rc.d/SERVERS index ea25acbeb658..48b19a51298d 100755 --- a/etc/rc.d/SERVERS +++ b/etc/rc.d/SERVERS @@ -6,7 +6,6 @@ # PROVIDE: SERVERS # REQUIRE: mountcritremote -# KEYWORD: FreeBSD # This is a dummy dependency, for early-start servers relying on # some basic configuration. diff --git a/etc/rc.d/abi b/etc/rc.d/abi index 7ff921fdaa0d..53c54472b3d1 100644 --- a/etc/rc.d/abi +++ b/etc/rc.d/abi @@ -6,7 +6,7 @@ # PROVIDE: abi # REQUIRE: LOGIN # BEFORE: securelevel -# KEYWORD: FreeBSD nojail +# KEYWORD: nojail . /etc/rc.subr diff --git a/etc/rc.d/accounting b/etc/rc.d/accounting index 98e21177250b..777555db474b 100755 --- a/etc/rc.d/accounting +++ b/etc/rc.d/accounting @@ -7,7 +7,7 @@ # PROVIDE: accounting # REQUIRE: mountcritremote # BEFORE: DAEMON -# KEYWORD: FreeBSD nojail +# KEYWORD: nojail . /etc/rc.subr diff --git a/etc/rc.d/addswap b/etc/rc.d/addswap index b075faa69257..8213a9077cdd 100644 --- a/etc/rc.d/addswap +++ b/etc/rc.d/addswap @@ -8,7 +8,7 @@ # PROVIDE: addswap # REQUIRE: mountcritlocal # BEFORE: sysctl -# KEYWORD: FreeBSD nojail +# KEYWORD: nojail . /etc/rc.subr diff --git a/etc/rc.d/adjkerntz b/etc/rc.d/adjkerntz index 10d7b6aafdc9..b420653daed6 100644 --- a/etc/rc.d/adjkerntz +++ b/etc/rc.d/adjkerntz @@ -6,7 +6,7 @@ # PROVIDE: adjkerntz # REQUIRE: mountcritlocal random # BEFORE: netif -# KEYWORD: FreeBSD nojail +# KEYWORD: nojail . /etc/rc.subr diff --git a/etc/rc.d/amd b/etc/rc.d/amd index bc1fd588553d..e445cf35d3bb 100755 --- a/etc/rc.d/amd +++ b/etc/rc.d/amd @@ -7,7 +7,7 @@ # PROVIDE: amd # REQUIRE: rpcbind ypbind nfsclient # BEFORE: DAEMON -# KEYWORD: FreeBSD nojail +# KEYWORD: nojail . /etc/rc.subr diff --git a/etc/rc.d/apm b/etc/rc.d/apm index 38576ec14306..3d15701956ed 100644 --- a/etc/rc.d/apm +++ b/etc/rc.d/apm @@ -6,7 +6,7 @@ # PROVIDE: apm # REQUIRE: DAEMON # BEFORE: LOGIN -# KEYWORD: FreeBSD nojail +# KEYWORD: nojail . /etc/rc.subr diff --git a/etc/rc.d/apmd b/etc/rc.d/apmd index 77a0e5d789b5..22410e139727 100755 --- a/etc/rc.d/apmd +++ b/etc/rc.d/apmd @@ -7,7 +7,7 @@ # PROVIDE: apmd # REQUIRE: DAEMON apm # BEFORE: LOGIN -# KEYWORD: FreeBSD nojail +# KEYWORD: nojail . /etc/rc.subr diff --git a/etc/rc.d/archdep b/etc/rc.d/archdep index 9bd4dbef79ba..da93e8ba860c 100644 --- a/etc/rc.d/archdep +++ b/etc/rc.d/archdep @@ -6,7 +6,7 @@ # PROVIDE: archdep # REQUIRE: LOGIN # BEFORE: abi -# KEYWORD: FreeBSD nojail +# KEYWORD: nojail . /etc/rc.subr diff --git a/etc/rc.d/atm1 b/etc/rc.d/atm1 index e867486dc41f..dc91700ed241 100644 --- a/etc/rc.d/atm1 +++ b/etc/rc.d/atm1 @@ -30,7 +30,7 @@ # PROVIDE: atm1 # REQUIRE: root # BEFORE: netif -# KEYWORD: FreeBSD nojail +# KEYWORD: nojail . /etc/rc.subr diff --git a/etc/rc.d/atm2 b/etc/rc.d/atm2 index 1f43a8ee8100..ffb63c35aef5 100644 --- a/etc/rc.d/atm2 +++ b/etc/rc.d/atm2 @@ -30,7 +30,7 @@ # PROVIDE: atm2 # REQUIRE: atm1 netif # BEFORE: routing -# KEYWORD: FreeBSD nojail +# KEYWORD: nojail # # Additional ATM interface configuration diff --git a/etc/rc.d/atm3 b/etc/rc.d/atm3 index efe808eb7919..4dbd128b8e85 100644 --- a/etc/rc.d/atm3 +++ b/etc/rc.d/atm3 @@ -32,7 +32,7 @@ # PROVIDE: atm3 # REQUIRE: atm2 # BEFORE: DAEMON -# KEYWORD: FreeBSD nojail +# KEYWORD: nojail . /etc/rc.subr diff --git a/etc/rc.d/bgfsck b/etc/rc.d/bgfsck index e14135e7cd76..4b41bcd7face 100644 --- a/etc/rc.d/bgfsck +++ b/etc/rc.d/bgfsck @@ -5,7 +5,7 @@ # PROVIDE: bgfsck # REQUIRE: cron devfs -# KEYWORD: FreeBSD nojail +# KEYWORD: nojail . /etc/rc.subr diff --git a/etc/rc.d/bootparams b/etc/rc.d/bootparams index 1e336d3c2428..bcef34651bdf 100755 --- a/etc/rc.d/bootparams +++ b/etc/rc.d/bootparams @@ -7,7 +7,7 @@ # PROVIDE: bootparams # REQUIRE: rpcbind DAEMON # BEFORE: LOGIN -# KEYWORD: FreeBSD nojail +# KEYWORD: nojail . /etc/rc.subr diff --git a/etc/rc.d/ccd b/etc/rc.d/ccd index 19cae472423b..ce58ac72cebe 100755 --- a/etc/rc.d/ccd +++ b/etc/rc.d/ccd @@ -5,7 +5,7 @@ # # PROVIDE: disks -# KEYWORD: FreeBSD nojail +# KEYWORD: nojail . /etc/rc.subr diff --git a/etc/rc.d/cleanvar b/etc/rc.d/cleanvar index d1864b71ed17..f2b396f0390c 100644 --- a/etc/rc.d/cleanvar +++ b/etc/rc.d/cleanvar @@ -5,7 +5,6 @@ # PROVIDE: cleanvar # REQUIRE: mountcritlocal var -# KEYWORD: FreeBSD purgedir() { diff --git a/etc/rc.d/cleartmp b/etc/rc.d/cleartmp index 92b47e386e3c..7bde18b24f0b 100755 --- a/etc/rc.d/cleartmp +++ b/etc/rc.d/cleartmp @@ -7,7 +7,6 @@ # PROVIDE: cleartmp # REQUIRE: mountcritremote tmp # BEFORE: DAEMON -# KEYWORD: FreeBSD . /etc/rc.subr diff --git a/etc/rc.d/cron b/etc/rc.d/cron index e5fc07633e19..f33264f44d08 100755 --- a/etc/rc.d/cron +++ b/etc/rc.d/cron @@ -7,7 +7,7 @@ # PROVIDE: cron # REQUIRE: LOGIN # BEFORE: securelevel -# KEYWORD: FreeBSD shutdown +# KEYWORD: shutdown . /etc/rc.subr diff --git a/etc/rc.d/devd b/etc/rc.d/devd index 0e4f923dd769..c282f3b1d0a2 100644 --- a/etc/rc.d/devd +++ b/etc/rc.d/devd @@ -6,7 +6,7 @@ # PROVIDE: devd # REQUIRE: NETWORKING # BEFORE: mountcritremote -# KEYWORD: FreeBSD nojail +# KEYWORD: nojail . /etc/rc.subr diff --git a/etc/rc.d/devfs b/etc/rc.d/devfs index 01c288d27c0b..76c271012a3e 100644 --- a/etc/rc.d/devfs +++ b/etc/rc.d/devfs @@ -6,7 +6,7 @@ # PROVIDE: devfs # REQUIRE: LOGIN # BEFORE: securelevel -# KEYWORD: FreeBSD nojail +# KEYWORD: nojail . /etc/rc.subr diff --git a/etc/rc.d/dhclient b/etc/rc.d/dhclient index dce871791178..a317f32aa99c 100755 --- a/etc/rc.d/dhclient +++ b/etc/rc.d/dhclient @@ -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. diff --git a/etc/rc.d/dmesg b/etc/rc.d/dmesg index 54316aae348c..6e2d552c01d3 100755 --- a/etc/rc.d/dmesg +++ b/etc/rc.d/dmesg @@ -7,7 +7,7 @@ # PROVIDE: dmesg # REQUIRE: mountcritremote # BEFORE: DAEMON -# KEYWORD: FreeBSD Daemon nojail +# KEYWORD: Daemon nojail . /etc/rc.subr diff --git a/etc/rc.d/dumpon b/etc/rc.d/dumpon index 5bb202e88ac6..0501d55c56d3 100644 --- a/etc/rc.d/dumpon +++ b/etc/rc.d/dumpon @@ -6,7 +6,7 @@ # PROVIDE: dumpon # REQUIRE: initrandom # BEFORE: disks savecore -# KEYWORD: FreeBSD nojail +# KEYWORD: nojail . /etc/rc.subr diff --git a/etc/rc.d/early.sh b/etc/rc.d/early.sh index b3a13d8e9dbb..aaebe33e234a 100644 --- a/etc/rc.d/early.sh +++ b/etc/rc.d/early.sh @@ -6,7 +6,6 @@ # PROVIDE: early # REQUIRE: disks localswap # BEFORE: fsck -# KEYWORD: FreeBSD # # Support for legacy /etc/rc.early script diff --git a/etc/rc.d/encswap b/etc/rc.d/encswap index 12de948c5161..82ac8da45f1a 100644 --- a/etc/rc.d/encswap +++ b/etc/rc.d/encswap @@ -5,7 +5,7 @@ # PROVIDE: disks # REQUIRE: initrandom -# KEYWORD: FreeBSD nojail +# KEYWORD: nojail . /etc/rc.subr diff --git a/etc/rc.d/fsck b/etc/rc.d/fsck index da27e4a0df44..7d329d28c258 100755 --- a/etc/rc.d/fsck +++ b/etc/rc.d/fsck @@ -6,7 +6,7 @@ # PROVIDE: fsck # REQUIRE: localswap -# KEYWORD: FreeBSD nojail +# KEYWORD: nojail . /etc/rc.subr diff --git a/etc/rc.d/gbde b/etc/rc.d/gbde index 42a9b562b04b..8842d46981e7 100644 --- a/etc/rc.d/gbde +++ b/etc/rc.d/gbde @@ -7,7 +7,7 @@ # # PROVIDE: disks -# KEYWORD: FreeBSD nojail +# KEYWORD: nojail . /etc/rc.subr diff --git a/etc/rc.d/gbde_swap b/etc/rc.d/gbde_swap index 12de948c5161..82ac8da45f1a 100644 --- a/etc/rc.d/gbde_swap +++ b/etc/rc.d/gbde_swap @@ -5,7 +5,7 @@ # PROVIDE: disks # REQUIRE: initrandom -# KEYWORD: FreeBSD nojail +# KEYWORD: nojail . /etc/rc.subr diff --git a/etc/rc.d/hostname b/etc/rc.d/hostname index 634add28800b..3db4e770d0a7 100644 --- a/etc/rc.d/hostname +++ b/etc/rc.d/hostname @@ -29,7 +29,6 @@ # PROVIDE: hostname # REQUIRE: mountcritlocal # BEFORE: netif -# KEYWORD: FreeBSD . /etc/rc.subr diff --git a/etc/rc.d/ike b/etc/rc.d/ike index 44706368d7a7..267113ea1cc5 100644 --- a/etc/rc.d/ike +++ b/etc/rc.d/ike @@ -6,7 +6,7 @@ # PROVIDE: ike # REQUIRE: root mountcritlocal # BEFORE: DAEMON -# KEYWORD: FreeBSD nojail +# KEYWORD: nojail . /etc/rc.subr diff --git a/etc/rc.d/inetd b/etc/rc.d/inetd index 6ca3387e15ee..d5b3b4415e44 100755 --- a/etc/rc.d/inetd +++ b/etc/rc.d/inetd @@ -6,7 +6,7 @@ # PROVIDE: inetd # REQUIRE: DAEMON LOGIN -# KEYWORD: FreeBSD shutdown +# KEYWORD: shutdown . /etc/rc.subr diff --git a/etc/rc.d/initdiskless b/etc/rc.d/initdiskless index b8ed0600dec1..23d7d5692715 100644 --- a/etc/rc.d/initdiskless +++ b/etc/rc.d/initdiskless @@ -28,7 +28,7 @@ # # REQUIRE: preseedrandom # PROVIDE: initdiskless -# KEYWORD: FreeBSD nojail +# KEYWORD: nojail # BEFORE: ipfw diff --git a/etc/rc.d/initrandom b/etc/rc.d/initrandom index e418d8627142..62f7b7558a47 100644 --- a/etc/rc.d/initrandom +++ b/etc/rc.d/initrandom @@ -6,7 +6,7 @@ # PROVIDE: initrandom # REQUIRE: initdiskless # BEFORE: disks -# KEYWORD: FreeBSD nojail +# KEYWORD: nojail . /etc/rc.subr diff --git a/etc/rc.d/ip6addrctl b/etc/rc.d/ip6addrctl index 552c19c6ad9f..910580ed238c 100644 --- a/etc/rc.d/ip6addrctl +++ b/etc/rc.d/ip6addrctl @@ -6,7 +6,7 @@ # PROVIDE: ip6addrctl # REQUIRE: mountcritlocal netif # BEFORE: network_ipv6 -# KEYWORD: FreeBSD nojail +# KEYWORD: nojail . /etc/rc.subr diff --git a/etc/rc.d/ip6fw b/etc/rc.d/ip6fw index d6db9ea9a0be..36aa29503262 100644 --- a/etc/rc.d/ip6fw +++ b/etc/rc.d/ip6fw @@ -6,7 +6,7 @@ # PROVIDE: ip6fw # REQUIRE: routing # BEFORE: network_ipv6 -# KEYWORD: FreeBSD nojail +# KEYWORD: nojail . /etc/rc.subr diff --git a/etc/rc.d/ipfilter b/etc/rc.d/ipfilter index 3f59b6c3785d..4fb17fcdb825 100755 --- a/etc/rc.d/ipfilter +++ b/etc/rc.d/ipfilter @@ -7,7 +7,7 @@ # PROVIDE: ipfilter # REQUIRE: root mountcritlocal # BEFORE: netif -# KEYWORD: FreeBSD nojail +# KEYWORD: nojail . /etc/rc.subr diff --git a/etc/rc.d/ipfs b/etc/rc.d/ipfs index 6e5721be645e..0adddacf4462 100755 --- a/etc/rc.d/ipfs +++ b/etc/rc.d/ipfs @@ -7,7 +7,7 @@ # PROVIDE: ipfs # REQUIRE: ipnat # BEFORE: netif -# KEYWORD: FreeBSD nojail shutdown +# KEYWORD: nojail shutdown . /etc/rc.subr diff --git a/etc/rc.d/ipfw b/etc/rc.d/ipfw index 2e8100c2b8a0..eda4437900e0 100644 --- a/etc/rc.d/ipfw +++ b/etc/rc.d/ipfw @@ -6,7 +6,7 @@ # PROVIDE: ipfw # REQUIRE: ppp-user # BEFORE: NETWORKING -# KEYWORD: FreeBSD nojail +# KEYWORD: nojail . /etc/rc.subr . /etc/network.subr diff --git a/etc/rc.d/ipmon b/etc/rc.d/ipmon index 3b8f24ce0d33..271b99dbc733 100755 --- a/etc/rc.d/ipmon +++ b/etc/rc.d/ipmon @@ -7,7 +7,7 @@ # PROVIDE: ipmon # REQUIRE: mountcritlocal hostname sysctl cleanvar ipfilter # BEFORE: SERVERS -# KEYWORD: FreeBSD nojail +# KEYWORD: nojail . /etc/rc.subr diff --git a/etc/rc.d/ipnat b/etc/rc.d/ipnat index 32581c550c92..4298f8e5726e 100755 --- a/etc/rc.d/ipnat +++ b/etc/rc.d/ipnat @@ -7,7 +7,7 @@ # PROVIDE: ipnat # REQUIRE: ipfilter # BEFORE: DAEMON netif -# KEYWORD: FreeBSD nojail +# KEYWORD: nojail . /etc/rc.subr diff --git a/etc/rc.d/ipsec b/etc/rc.d/ipsec index e238ae9021eb..788ff3a01bf8 100755 --- a/etc/rc.d/ipsec +++ b/etc/rc.d/ipsec @@ -7,7 +7,7 @@ # PROVIDE: ipsec # REQUIRE: root mountcritlocal # BEFORE: DAEMON -# KEYWORD: FreeBSD nojail +# KEYWORD: nojail # it does not really require beforenetlkm. diff --git a/etc/rc.d/ipxrouted b/etc/rc.d/ipxrouted index 910db8f2fd69..04d3586daa39 100644 --- a/etc/rc.d/ipxrouted +++ b/etc/rc.d/ipxrouted @@ -6,7 +6,7 @@ # PROVIDE: ipxrouted # REQUIRE: SERVERS # BEFORE: DAEMON -# KEYWORD: FreeBSD nojail +# KEYWORD: nojail . /etc/rc.subr diff --git a/etc/rc.d/isdnd b/etc/rc.d/isdnd index b015b6bd9c8a..94765057c258 100644 --- a/etc/rc.d/isdnd +++ b/etc/rc.d/isdnd @@ -8,7 +8,7 @@ # PROVIDE: isdnd # REQUIRE: netif mountcritlocal -# KEYWORD: FreeBSD nojail +# KEYWORD: nojail . /etc/rc.subr diff --git a/etc/rc.d/jail b/etc/rc.d/jail index addb2e704c8a..bdb797adacc7 100644 --- a/etc/rc.d/jail +++ b/etc/rc.d/jail @@ -6,7 +6,7 @@ # PROVIDE: jail # REQUIRE: LOGIN # BEFORE: securelevel -# KEYWORD: FreeBSD nojail shutdown +# KEYWORD: nojail shutdown . /etc/rc.subr diff --git a/etc/rc.d/kadmind b/etc/rc.d/kadmind index 6715115d97dc..1e07938ffcd6 100644 --- a/etc/rc.d/kadmind +++ b/etc/rc.d/kadmind @@ -6,7 +6,6 @@ # PROVIDE: kadmin # REQUIRE: kerberos # BEFORE: DAEMON -# KEYWORD: FreeBSD . /etc/rc.subr diff --git a/etc/rc.d/kerberos b/etc/rc.d/kerberos index 5d4f0f6503de..6e101e3e6ed5 100644 --- a/etc/rc.d/kerberos +++ b/etc/rc.d/kerberos @@ -5,7 +5,6 @@ # PROVIDE: kerberos # REQUIRE: NETWORKING -# KEYWORD: FreeBSD . /etc/rc.subr diff --git a/etc/rc.d/keyserv b/etc/rc.d/keyserv index 44194260ac69..6be21278e537 100644 --- a/etc/rc.d/keyserv +++ b/etc/rc.d/keyserv @@ -9,7 +9,6 @@ # PROVIDE: keyserv # REQUIRE: ypbind # BEFORE: DAEMON -# KEYWORD: FreeBSD . /etc/rc.subr diff --git a/etc/rc.d/kldxref b/etc/rc.d/kldxref index 62a4832a94a6..866321396379 100644 --- a/etc/rc.d/kldxref +++ b/etc/rc.d/kldxref @@ -6,7 +6,7 @@ # PROVIDE: kldxref # REQUIRE: root mountcritlocal # BEFORE: netif -# KEYWORD: FreeBSD nojail +# KEYWORD: nojail . /etc/rc.subr diff --git a/etc/rc.d/kpasswdd b/etc/rc.d/kpasswdd index 5d628786b19a..d7f40ac4ad7d 100644 --- a/etc/rc.d/kpasswdd +++ b/etc/rc.d/kpasswdd @@ -6,7 +6,6 @@ # PROVIDE: kpasswdd # REQUIRE: kadmin # BEFORE: DAEMON -# KEYWORD: FreeBSD . /etc/rc.subr diff --git a/etc/rc.d/ldconfig b/etc/rc.d/ldconfig index 9dbcbe9ba988..507118c59dbf 100755 --- a/etc/rc.d/ldconfig +++ b/etc/rc.d/ldconfig @@ -7,7 +7,6 @@ # PROVIDE: ldconfig # REQUIRE: mountcritremote # BEFORE: DAEMON -# KEYWORD: FreeBSD . /etc/rc.subr diff --git a/etc/rc.d/local b/etc/rc.d/local index cd96982d8385..da163f6d9cbb 100755 --- a/etc/rc.d/local +++ b/etc/rc.d/local @@ -7,7 +7,7 @@ # PROVIDE: local # REQUIRE: DAEMON # BEFORE: LOGIN -# KEYWORD: FreeBSD shutdown +# KEYWORD: shutdown . /etc/rc.subr diff --git a/etc/rc.d/localpkg b/etc/rc.d/localpkg index add28fe00860..fb429c9ace16 100644 --- a/etc/rc.d/localpkg +++ b/etc/rc.d/localpkg @@ -6,7 +6,7 @@ # PROVIDE: localpkg # REQUIRE: abi # BEFORE: securelevel -# KEYWORD: FreeBSD shutdown +# KEYWORD: shutdown . /etc/rc.subr diff --git a/etc/rc.d/lockd b/etc/rc.d/lockd index 20b5e08ccbb3..f8a77e8afa7a 100644 --- a/etc/rc.d/lockd +++ b/etc/rc.d/lockd @@ -7,7 +7,7 @@ # PROVIDE: nfslocking # REQUIRE: nfsserver nfsclient nfsd # BEFORE: DAEMON -# KEYWORD: FreeBSD nojail +# KEYWORD: nojail . /etc/rc.subr diff --git a/etc/rc.d/lomac b/etc/rc.d/lomac index af16f749714b..84b571816f81 100644 --- a/etc/rc.d/lomac +++ b/etc/rc.d/lomac @@ -6,7 +6,7 @@ # PROVIDE: lomac # REQUIRE: mountcritremote # BEFORE: syslogd -# KEYWORD: FreeBSD nojail +# KEYWORD: nojail . /etc/rc.subr diff --git a/etc/rc.d/lpd b/etc/rc.d/lpd index e28644015806..8ab3a8c88b6b 100755 --- a/etc/rc.d/lpd +++ b/etc/rc.d/lpd @@ -7,7 +7,6 @@ # PROVIDE: lpd # REQUIRE: DAEMON # BEFORE: LOGIN -# KEYWORD: FreeBSD . /etc/rc.subr diff --git a/etc/rc.d/mixer b/etc/rc.d/mixer index 7e9cd042934b..e5aafeab15e3 100644 --- a/etc/rc.d/mixer +++ b/etc/rc.d/mixer @@ -29,7 +29,7 @@ # PROVIDE: mixer # REQUIRE: LOGIN usbd -# KEYWORD: FreeBSD nojail shutdown +# KEYWORD: nojail shutdown . /etc/rc.subr diff --git a/etc/rc.d/motd b/etc/rc.d/motd index cddaeb952635..2b675b51409a 100755 --- a/etc/rc.d/motd +++ b/etc/rc.d/motd @@ -7,7 +7,6 @@ # PROVIDE: motd # REQUIRE: mountcritremote # BEFORE: LOGIN -# KEYWORD: FreeBSD . /etc/rc.subr diff --git a/etc/rc.d/mountcritlocal b/etc/rc.d/mountcritlocal index cd937d149579..49f1ba9bdef8 100755 --- a/etc/rc.d/mountcritlocal +++ b/etc/rc.d/mountcritlocal @@ -6,7 +6,7 @@ # PROVIDE: mountcritlocal # REQUIRE: root -# KEYWORD: FreeBSD nojail +# KEYWORD: nojail . /etc/rc.subr diff --git a/etc/rc.d/mountcritremote b/etc/rc.d/mountcritremote index 83b6f77e459e..67e60f074941 100755 --- a/etc/rc.d/mountcritremote +++ b/etc/rc.d/mountcritremote @@ -6,7 +6,7 @@ # PROVIDE: mountcritremote # REQUIRE: NETWORKING root mountcritlocal -# KEYWORD: FreeBSD nojail +# KEYWORD: nojail . /etc/rc.subr diff --git a/etc/rc.d/mountd b/etc/rc.d/mountd index b8c6d37d4bcb..df012429b0e3 100755 --- a/etc/rc.d/mountd +++ b/etc/rc.d/mountd @@ -6,7 +6,7 @@ # PROVIDE: mountd # REQUIRE: NETWORKING nfsserver rpcbind quota -# KEYWORD: FreeBSD nojail +# KEYWORD: nojail . /etc/rc.subr diff --git a/etc/rc.d/moused b/etc/rc.d/moused index 93b564bf36fd..9ef5ee57f4bc 100644 --- a/etc/rc.d/moused +++ b/etc/rc.d/moused @@ -6,7 +6,7 @@ # PROVIDE: moused # REQUIRE: DAEMON -# KEYWORD: FreeBSD nojail +# KEYWORD: nojail . /etc/rc.subr diff --git a/etc/rc.d/mroute6d b/etc/rc.d/mroute6d index b96c3eecca54..d733092df145 100644 --- a/etc/rc.d/mroute6d +++ b/etc/rc.d/mroute6d @@ -5,7 +5,7 @@ # PROVIDE: mroute6d # REQUIRE: network_ipv6 -# KEYWORD: FreeBSD nojail +# KEYWORD: nojail . /etc/rc.subr diff --git a/etc/rc.d/mrouted b/etc/rc.d/mrouted index cfd3fc356aaa..c3772766bcfb 100755 --- a/etc/rc.d/mrouted +++ b/etc/rc.d/mrouted @@ -6,7 +6,7 @@ # PROVIDE: mrouted # REQUIRE: netif routing -# KEYWORD: FreeBSD nojail +# KEYWORD: nojail . /etc/rc.subr diff --git a/etc/rc.d/msgs b/etc/rc.d/msgs index 64e73cf4ee6d..6031acc7337d 100644 --- a/etc/rc.d/msgs +++ b/etc/rc.d/msgs @@ -5,7 +5,6 @@ # PROVIDE: msgs # REQUIRE: LOGIN -# KEYWORD: FreeBSD # Make a bounds file for msgs(1) if there isn't one already # diff --git a/etc/rc.d/named b/etc/rc.d/named index a4dc42ca2a6a..808d253cbe33 100755 --- a/etc/rc.d/named +++ b/etc/rc.d/named @@ -7,7 +7,6 @@ # PROVIDE: named # REQUIRE: SERVERS # BEFORE: DAEMON -# KEYWORD: FreeBSD . /etc/rc.subr diff --git a/etc/rc.d/natd b/etc/rc.d/natd index 53a370d23a8a..4bfdcfc3cb61 100644 --- a/etc/rc.d/natd +++ b/etc/rc.d/natd @@ -4,7 +4,7 @@ # # PROVIDE: natd -# KEYWORD: FreeBSD nostart nojail +# KEYWORD: nostart nojail . /etc/rc.subr . /etc/network.subr diff --git a/etc/rc.d/netif b/etc/rc.d/netif index 44a1bfa3ac9a..029076c1dd96 100644 --- a/etc/rc.d/netif +++ b/etc/rc.d/netif @@ -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 diff --git a/etc/rc.d/netoptions b/etc/rc.d/netoptions index 6500fbbe4612..f9329644decb 100644 --- a/etc/rc.d/netoptions +++ b/etc/rc.d/netoptions @@ -6,7 +6,7 @@ # PROVIDE: netoptions # REQUIRE: localpkg # BEFORE: securelevel -# KEYWORD: FreeBSD nojail +# KEYWORD: nojail . /etc/rc.subr diff --git a/etc/rc.d/network_ipv6 b/etc/rc.d/network_ipv6 index a434bf3ef7c0..d47416449778 100644 --- a/etc/rc.d/network_ipv6 +++ b/etc/rc.d/network_ipv6 @@ -30,7 +30,7 @@ # PROVIDE: network_ipv6 # REQUIRE: routing -# KEYWORD: FreeBSD nojail +# KEYWORD: nojail . /etc/rc.subr . /etc/network.subr diff --git a/etc/rc.d/nfsclient b/etc/rc.d/nfsclient index 572904cf756d..b6d4bf1af04c 100644 --- a/etc/rc.d/nfsclient +++ b/etc/rc.d/nfsclient @@ -5,7 +5,7 @@ # PROVIDE: nfsclient # REQUIRE: NETWORKING mountcritremote rpcbind -# KEYWORD: FreeBSD nojail shutdown +# KEYWORD: nojail shutdown . /etc/rc.subr diff --git a/etc/rc.d/nfsd b/etc/rc.d/nfsd index debe06f4f0b9..62b3e7cfc0cb 100755 --- a/etc/rc.d/nfsd +++ b/etc/rc.d/nfsd @@ -6,7 +6,7 @@ # PROVIDE: nfsd # REQUIRE: mountd -# KEYWORD: FreeBSD nojail +# KEYWORD: nojail . /etc/rc.subr diff --git a/etc/rc.d/nfslocking b/etc/rc.d/nfslocking index 20b5e08ccbb3..f8a77e8afa7a 100755 --- a/etc/rc.d/nfslocking +++ b/etc/rc.d/nfslocking @@ -7,7 +7,7 @@ # PROVIDE: nfslocking # REQUIRE: nfsserver nfsclient nfsd # BEFORE: DAEMON -# KEYWORD: FreeBSD nojail +# KEYWORD: nojail . /etc/rc.subr diff --git a/etc/rc.d/nfsserver b/etc/rc.d/nfsserver index 280bbda3310f..76531ffd7921 100644 --- a/etc/rc.d/nfsserver +++ b/etc/rc.d/nfsserver @@ -5,7 +5,7 @@ # PROVIDE: nfsserver # REQUIRE: NETWORKING mountcritremote -# KEYWORD: FreeBSD nojail +# KEYWORD: nojail . /etc/rc.subr diff --git a/etc/rc.d/nisdomain b/etc/rc.d/nisdomain index 1ca4afa992fd..a24f107d1513 100644 --- a/etc/rc.d/nisdomain +++ b/etc/rc.d/nisdomain @@ -29,7 +29,6 @@ # PROVIDE: nisdomain # REQUIRE: SERVERS rpcbind # BEFORE: ypbind ypserv ypxfrd -# KEYWORD: FreeBSD . /etc/rc.subr diff --git a/etc/rc.d/nsswitch b/etc/rc.d/nsswitch index 8ce85075e03c..3ba233b00fb5 100644 --- a/etc/rc.d/nsswitch +++ b/etc/rc.d/nsswitch @@ -29,7 +29,6 @@ # PROVIDE: nsswitch # REQUIRE: root # BEFORE: NETWORK -# KEYWORD: FreeBSD . /etc/rc.subr diff --git a/etc/rc.d/ntpd b/etc/rc.d/ntpd index d7c8ce1642a7..248151773bee 100755 --- a/etc/rc.d/ntpd +++ b/etc/rc.d/ntpd @@ -7,7 +7,7 @@ # PROVIDE: ntpd # REQUIRE: DAEMON # BEFORE: LOGIN -# KEYWORD: FreeBSD nojail +# KEYWORD: nojail . /etc/rc.subr diff --git a/etc/rc.d/ntpdate b/etc/rc.d/ntpdate index a8f1e23b357e..28d6777d8f4b 100755 --- a/etc/rc.d/ntpdate +++ b/etc/rc.d/ntpdate @@ -7,7 +7,7 @@ # BEFORE: ntpd # PROVIDE: ntpdate # REQUIRE: NETWORKING syslogd -# KEYWORD: FreeBSD nojail +# KEYWORD: nojail . /etc/rc.subr diff --git a/etc/rc.d/othermta b/etc/rc.d/othermta index 05236a80c5ab..7ab3e63649ac 100644 --- a/etc/rc.d/othermta +++ b/etc/rc.d/othermta @@ -5,7 +5,6 @@ # PROVIDE: mail # REQUIRE: LOGIN -# KEYWORD: FreeBSD # XXX - TEMPORARY SCRIPT UNTIL YOU WRITE YOUR OWN REPLACEMENT. # diff --git a/etc/rc.d/pccard b/etc/rc.d/pccard index 5c4ba828873f..67604bd066f8 100644 --- a/etc/rc.d/pccard +++ b/etc/rc.d/pccard @@ -29,7 +29,7 @@ # PROVIDE: pccard # REQUIRE: mountcritlocal -# KEYWORD: FreeBSD nojail +# KEYWORD: nojail . /etc/rc.subr diff --git a/etc/rc.d/pcvt b/etc/rc.d/pcvt index ad6f5f65aaa1..dd84b0fcebff 100644 --- a/etc/rc.d/pcvt +++ b/etc/rc.d/pcvt @@ -29,7 +29,7 @@ # PROVIDE: pcvt # REQUIRE: LOGIN -# KEYWORD: FreeBSD nojail +# KEYWORD: nojail . /etc/rc.subr diff --git a/etc/rc.d/pf b/etc/rc.d/pf index 95c539b232a5..b8a0c7511197 100644 --- a/etc/rc.d/pf +++ b/etc/rc.d/pf @@ -6,7 +6,7 @@ # PROVIDE: pf # REQUIRE: root mountcritlocal netif pflog # BEFORE: DAEMON LOGIN -# KEYWORD: FreeBSD nojail +# KEYWORD: nojail . /etc/rc.subr diff --git a/etc/rc.d/pflog b/etc/rc.d/pflog index 051d4e14c0b1..86995e9c9ef5 100644 --- a/etc/rc.d/pflog +++ b/etc/rc.d/pflog @@ -6,7 +6,7 @@ # PROVIDE: pflog # REQUIRE: root mountcritlocal netif # BEFORE: DAEMON LOGIN -# KEYWORD: FreeBSD nojail +# KEYWORD: nojail . /etc/rc.subr diff --git a/etc/rc.d/power_profile b/etc/rc.d/power_profile index 7e23cf506d83..45c341a10f40 100644 --- a/etc/rc.d/power_profile +++ b/etc/rc.d/power_profile @@ -9,7 +9,7 @@ # # PROVIDE: power_profile -# KEYWORD: FreeBSD nojail nostart +# KEYWORD: nojail nostart . /etc/rc.subr diff --git a/etc/rc.d/ppp b/etc/rc.d/ppp index 945ffe72a4ea..305ee1cc50ac 100644 --- a/etc/rc.d/ppp +++ b/etc/rc.d/ppp @@ -5,7 +5,7 @@ # PROVIDE: ppp-user # REQUIRE: netif isdnd -# KEYWORD: FreeBSD nojail +# KEYWORD: nojail . /etc/rc.subr diff --git a/etc/rc.d/ppp-user b/etc/rc.d/ppp-user index 945ffe72a4ea..305ee1cc50ac 100644 --- a/etc/rc.d/ppp-user +++ b/etc/rc.d/ppp-user @@ -5,7 +5,7 @@ # PROVIDE: ppp-user # REQUIRE: netif isdnd -# KEYWORD: FreeBSD nojail +# KEYWORD: nojail . /etc/rc.subr diff --git a/etc/rc.d/pppoed b/etc/rc.d/pppoed index fd2be8c474ee..b9cfb142a5cf 100644 --- a/etc/rc.d/pppoed +++ b/etc/rc.d/pppoed @@ -6,7 +6,7 @@ # PROVIDE: pppoed # REQUIRE: NETWORKING # BEFORE: DAEMON -# KEYWORD: FreeBSD nojail +# KEYWORD: nojail . /etc/rc.subr diff --git a/etc/rc.d/preseedrandom b/etc/rc.d/preseedrandom index 14b2378a9ca0..a563189816ac 100644 --- a/etc/rc.d/preseedrandom +++ b/etc/rc.d/preseedrandom @@ -4,7 +4,7 @@ # # PROVIDE: preseedrandom -# KEYWORD: FreeBSD nojail +# KEYWORD: nojail feed_dev_random() { diff --git a/etc/rc.d/pwcheck b/etc/rc.d/pwcheck index 8d4e8ae511b8..b07c993a7dff 100755 --- a/etc/rc.d/pwcheck +++ b/etc/rc.d/pwcheck @@ -7,7 +7,6 @@ # PROVIDE: pwcheck # REQUIRE: mountcritremote syslogd # BEFORE: DAEMON -# KEYWORD: FreeBSD . /etc/rc.subr diff --git a/etc/rc.d/quota b/etc/rc.d/quota index 27ce6a9beec2..8a81f83ab974 100755 --- a/etc/rc.d/quota +++ b/etc/rc.d/quota @@ -9,7 +9,7 @@ # PROVIDE: quota # REQUIRE: mountcritremote # BEFORE: DAEMON -# KEYWORD: FreeBSD nojail +# KEYWORD: nojail . /etc/rc.subr diff --git a/etc/rc.d/ramdisk b/etc/rc.d/ramdisk index 3ac0cb15d04f..3ac0c42a3b21 100644 --- a/etc/rc.d/ramdisk +++ b/etc/rc.d/ramdisk @@ -30,7 +30,6 @@ # PROVIDE: ramdisk # REQUIRE: localswap # BEFORE: mountcritlocal -# KEYWORD: FreeBSD . /etc/rc.subr diff --git a/etc/rc.d/ramdisk-own b/etc/rc.d/ramdisk-own index 2c287c357c27..f1fe11038ebd 100644 --- a/etc/rc.d/ramdisk-own +++ b/etc/rc.d/ramdisk-own @@ -30,7 +30,6 @@ # PROVIDE: ramdisk-own # REQUIRE: ramdisk mountcritlocal # BEFORE: SERVERS -# KEYWORD: FreeBSD . /etc/rc.subr diff --git a/etc/rc.d/random b/etc/rc.d/random index e603f31721a5..823db6de77e5 100644 --- a/etc/rc.d/random +++ b/etc/rc.d/random @@ -6,7 +6,7 @@ # PROVIDE: random # REQUIRE: var initrandom # BEFORE: netif -# KEYWORD: FreeBSD nojail shutdown +# KEYWORD: nojail shutdown . /etc/rc.subr diff --git a/etc/rc.d/rarpd b/etc/rc.d/rarpd index 4edb3facd943..ea518508f25c 100755 --- a/etc/rc.d/rarpd +++ b/etc/rc.d/rarpd @@ -7,7 +7,7 @@ # PROVIDE: rarpd # REQUIRE: DAEMON # BEFORE: LOGIN -# KEYWORD: FreeBSD nojail +# KEYWORD: nojail . /etc/rc.subr diff --git a/etc/rc.d/rcconf.sh b/etc/rc.d/rcconf.sh index 79d8fdcc32e9..a4a3745b388d 100644 --- a/etc/rc.d/rcconf.sh +++ b/etc/rc.d/rcconf.sh @@ -6,7 +6,6 @@ # PROVIDE: rcconf # REQUIRE: initdiskless # BEFORE: disks initrandom -# KEYWORD: FreeBSD . /etc/rc.subr diff --git a/etc/rc.d/resolv b/etc/rc.d/resolv index 597e82add720..8e2c26941243 100644 --- a/etc/rc.d/resolv +++ b/etc/rc.d/resolv @@ -29,7 +29,7 @@ # PROVIDE: resolv # REQUIRE: initdiskless rcconf -# KEYWORD: FreeBSD nojail +# KEYWORD: nojail . /etc/rc.subr diff --git a/etc/rc.d/root b/etc/rc.d/root index ebb3c76b10b6..aeb9a980742c 100755 --- a/etc/rc.d/root +++ b/etc/rc.d/root @@ -6,7 +6,7 @@ # PROVIDE: root # REQUIRE: fsck -# KEYWORD: FreeBSD nojail +# KEYWORD: nojail . /etc/rc.subr diff --git a/etc/rc.d/route6d b/etc/rc.d/route6d index e43a62adcf32..e9861b47a9f8 100755 --- a/etc/rc.d/route6d +++ b/etc/rc.d/route6d @@ -6,7 +6,7 @@ # PROVIDE: route6d # REQUIRE: network_ipv6 -# KEYWORD: FreeBSD nojail +# KEYWORD: nojail . /etc/rc.subr diff --git a/etc/rc.d/routed b/etc/rc.d/routed index e163960b03ea..6ecab4fe360f 100755 --- a/etc/rc.d/routed +++ b/etc/rc.d/routed @@ -6,7 +6,7 @@ # PROVIDE: routed # REQUIRE: netif routing -# KEYWORD: FreeBSD nojail +# KEYWORD: nojail . /etc/rc.subr diff --git a/etc/rc.d/routing b/etc/rc.d/routing index 91011c41d261..dc6da0fea6c7 100644 --- a/etc/rc.d/routing +++ b/etc/rc.d/routing @@ -7,7 +7,7 @@ # PROVIDE: routing # REQUIRE: netif ppp-user -# KEYWORD: FreeBSD nojail +# KEYWORD: nojail . /etc/rc.subr diff --git a/etc/rc.d/rpcbind b/etc/rc.d/rpcbind index 8d8d97cbb942..84595354cf8c 100755 --- a/etc/rc.d/rpcbind +++ b/etc/rc.d/rpcbind @@ -6,7 +6,6 @@ # PROVIDE: rpcbind # REQUIRE: NETWORKING ntpdate syslogd named -# KEYWORD: FreeBSD . /etc/rc.subr diff --git a/etc/rc.d/rtadvd b/etc/rc.d/rtadvd index 0f3ac7086cf3..c21106af388b 100755 --- a/etc/rc.d/rtadvd +++ b/etc/rc.d/rtadvd @@ -7,7 +7,7 @@ # PROVIDE: rtadvd # REQUIRE: DAEMON # BEFORE: LOGIN -# KEYWORD: FreeBSD nojail +# KEYWORD: nojail . /etc/rc.subr diff --git a/etc/rc.d/rwho b/etc/rc.d/rwho index 27a1923c1ab4..9a319bbe1cb9 100755 --- a/etc/rc.d/rwho +++ b/etc/rc.d/rwho @@ -7,7 +7,6 @@ # PROVIDE: rwho # REQUIRE: DAEMON # BEFORE: LOGIN -# KEYWORD: FreeBSD . /etc/rc.subr diff --git a/etc/rc.d/savecore b/etc/rc.d/savecore index 9a5c9e8b7ca2..e6904b5c5777 100755 --- a/etc/rc.d/savecore +++ b/etc/rc.d/savecore @@ -7,7 +7,7 @@ # PROVIDE: savecore # REQUIRE: syslogd # BEFORE: SERVERS -# KEYWORD: FreeBSD nojail +# KEYWORD: nojail . /etc/rc.subr diff --git a/etc/rc.d/securelevel b/etc/rc.d/securelevel index 25c2ac5876f2..8bd5ee1a9cd5 100755 --- a/etc/rc.d/securelevel +++ b/etc/rc.d/securelevel @@ -5,7 +5,6 @@ # # PROVIDE: securelevel -# KEYWORD: FreeBSD . /etc/rc.subr diff --git a/etc/rc.d/sendmail b/etc/rc.d/sendmail index 8b15a49ee3da..b7ac600c58be 100755 --- a/etc/rc.d/sendmail +++ b/etc/rc.d/sendmail @@ -6,7 +6,6 @@ # PROVIDE: mail # REQUIRE: LOGIN -# KEYWORD: FreeBSD # we make mail start late, so that things like .forward's are not # processed until the system is fully operational diff --git a/etc/rc.d/serial b/etc/rc.d/serial index 4931bb4060db..17d725b10f8b 100644 --- a/etc/rc.d/serial +++ b/etc/rc.d/serial @@ -29,7 +29,7 @@ # PROVIDE: serial # REQUIRE: root -# KEYWORD: FreeBSD nojail +# KEYWORD: nojail # Change some defaults for serial devices. # Standard defaults are: diff --git a/etc/rc.d/sppp b/etc/rc.d/sppp index d62b577e0b74..d4a183bf3fb5 100644 --- a/etc/rc.d/sppp +++ b/etc/rc.d/sppp @@ -6,7 +6,7 @@ # PROVIDE: sppp # REQUIRE: root # BEFORE: netif -# KEYWORD: FreeBSD nojail +# KEYWORD: nojail . /etc/rc.subr diff --git a/etc/rc.d/sshd b/etc/rc.d/sshd index 3ee2b4d02fb9..e77ddab03352 100755 --- a/etc/rc.d/sshd +++ b/etc/rc.d/sshd @@ -6,7 +6,6 @@ # PROVIDE: sshd # REQUIRE: LOGIN -# KEYWORD: FreeBSD . /etc/rc.subr diff --git a/etc/rc.d/statd b/etc/rc.d/statd index 20b5e08ccbb3..f8a77e8afa7a 100644 --- a/etc/rc.d/statd +++ b/etc/rc.d/statd @@ -7,7 +7,7 @@ # PROVIDE: nfslocking # REQUIRE: nfsserver nfsclient nfsd # BEFORE: DAEMON -# KEYWORD: FreeBSD nojail +# KEYWORD: nojail . /etc/rc.subr diff --git a/etc/rc.d/swap1 b/etc/rc.d/swap1 index 29af8e8545fe..6be71b3a585d 100755 --- a/etc/rc.d/swap1 +++ b/etc/rc.d/swap1 @@ -6,7 +6,7 @@ # PROVIDE: localswap # REQUIRE: disks -# KEYWORD: FreeBSD nojail shutdown +# KEYWORD: nojail shutdown . /etc/rc.subr diff --git a/etc/rc.d/syscons b/etc/rc.d/syscons index ac0144fe42a7..9d7caf521f12 100644 --- a/etc/rc.d/syscons +++ b/etc/rc.d/syscons @@ -29,7 +29,7 @@ # PROVIDE: syscons # REQUIRE: LOGIN usbd -# KEYWORD: FreeBSD nojail +# KEYWORD: nojail . /etc/rc.subr diff --git a/etc/rc.d/sysctl b/etc/rc.d/sysctl index 0cd065f18022..67d3e063a69e 100644 --- a/etc/rc.d/sysctl +++ b/etc/rc.d/sysctl @@ -7,7 +7,6 @@ # PROVIDE: sysctl # REQUIRE: root # BEFORE: DAEMON -# KEYWORD: FreeBSD . /etc/rc.subr diff --git a/etc/rc.d/syslogd b/etc/rc.d/syslogd index 13732f85f71f..ac3c4dbf938d 100755 --- a/etc/rc.d/syslogd +++ b/etc/rc.d/syslogd @@ -7,7 +7,6 @@ # PROVIDE: syslogd # REQUIRE: mountcritremote cleanvar # BEFORE: SERVERS -# KEYWORD: FreeBSD . /etc/rc.subr diff --git a/etc/rc.d/timed b/etc/rc.d/timed index 82ee57e56c92..016c831eead1 100755 --- a/etc/rc.d/timed +++ b/etc/rc.d/timed @@ -7,7 +7,7 @@ # PROVIDE: timed # REQUIRE: DAEMON # BEFORE: LOGIN -# KEYWORD: FreeBSD nojail +# KEYWORD: nojail . /etc/rc.subr diff --git a/etc/rc.d/tmp b/etc/rc.d/tmp index a39fd8c6d6a8..0c7a460a0c30 100644 --- a/etc/rc.d/tmp +++ b/etc/rc.d/tmp @@ -29,7 +29,6 @@ # PROVIDE: tmp # REQUIRE: mountcritlocal -# KEYWORD: FreeBSD . /etc/rc.subr diff --git a/etc/rc.d/usbd b/etc/rc.d/usbd index 87caa741baa4..979589cacc8d 100644 --- a/etc/rc.d/usbd +++ b/etc/rc.d/usbd @@ -6,7 +6,7 @@ # PROVIDE: usbd # REQUIRE: DAEMON # BEFORE: LOGIN -# KEYWORD: FreeBSD nojail +# KEYWORD: nojail . /etc/rc.subr diff --git a/etc/rc.d/var b/etc/rc.d/var index 1f7fa3df0b55..7a4baf425db0 100644 --- a/etc/rc.d/var +++ b/etc/rc.d/var @@ -29,7 +29,6 @@ # PROVIDE: var # REQUIRE: mountcritlocal -# KEYWORD: FreeBSD . /etc/rc.subr diff --git a/etc/rc.d/vinum b/etc/rc.d/vinum index c1e5a2d62539..af1b0956d8a5 100644 --- a/etc/rc.d/vinum +++ b/etc/rc.d/vinum @@ -4,7 +4,7 @@ # # PROVIDE: disks -# KEYWORD: FreeBSD nojail +# KEYWORD: nojail . /etc/rc.subr diff --git a/etc/rc.d/virecover b/etc/rc.d/virecover index 9fd1a8d1dcd7..9af4151ad3aa 100755 --- a/etc/rc.d/virecover +++ b/etc/rc.d/virecover @@ -7,7 +7,6 @@ # PROVIDE: virecover # REQUIRE: mountcritremote ldconfig # BEFORE: DAEMON -# KEYWORD: FreeBSD # # XXX: should require `mail'! diff --git a/etc/rc.d/watchdogd b/etc/rc.d/watchdogd index 84654dbc6beb..9dc22a59c769 100644 --- a/etc/rc.d/watchdogd +++ b/etc/rc.d/watchdogd @@ -29,7 +29,7 @@ # PROVIDE: watchdogd # REQUIRE: DAEMON -# KEYWORD: FreeBSD nojail +# KEYWORD: nojail . /etc/rc.subr diff --git a/etc/rc.d/ypbind b/etc/rc.d/ypbind index 8c8644c75766..0ed5cd5ec426 100755 --- a/etc/rc.d/ypbind +++ b/etc/rc.d/ypbind @@ -7,7 +7,6 @@ # PROVIDE: ypbind # REQUIRE: ypserv # BEFORE: DAEMON -# KEYWORD: FreeBSD . /etc/rc.subr diff --git a/etc/rc.d/yppasswdd b/etc/rc.d/yppasswdd index 8d82d0811a32..4e805f5f704d 100755 --- a/etc/rc.d/yppasswdd +++ b/etc/rc.d/yppasswdd @@ -7,7 +7,6 @@ # PROVIDE: yppasswdd # REQUIRE: ypserv ypbind # BEFORE: LOGIN -# KEYWORD: FreeBSD . /etc/rc.subr diff --git a/etc/rc.d/ypserv b/etc/rc.d/ypserv index c5c92e5b1a23..54ddd5bff611 100755 --- a/etc/rc.d/ypserv +++ b/etc/rc.d/ypserv @@ -6,7 +6,6 @@ # PROVIDE: ypserv # REQUIRE: rpcbind -# KEYWORD: FreeBSD . /etc/rc.subr diff --git a/etc/rc.d/ypset b/etc/rc.d/ypset index df643b30ef97..bf091c168d7f 100644 --- a/etc/rc.d/ypset +++ b/etc/rc.d/ypset @@ -5,7 +5,6 @@ # PROVIDE: ypset # REQUIRE: ypbind -# KEYWORD: FreeBSD . /etc/rc.subr diff --git a/etc/rc.d/ypupdated b/etc/rc.d/ypupdated index 1fedf76968ef..106db0f4bf16 100644 --- a/etc/rc.d/ypupdated +++ b/etc/rc.d/ypupdated @@ -5,7 +5,6 @@ # PROVIDE: ypupdated # REQUIRE: rpcbind ypserv -# KEYWORD: FreeBSD . /etc/rc.subr diff --git a/etc/rc.d/ypxfrd b/etc/rc.d/ypxfrd index d39a9c497e47..100092e0fee1 100644 --- a/etc/rc.d/ypxfrd +++ b/etc/rc.d/ypxfrd @@ -5,7 +5,6 @@ # PROVIDE: ypxfrd # REQUIRE: rpcbind -# KEYWORD: FreeBSD . /etc/rc.subr diff --git a/etc/rc.initdiskless b/etc/rc.initdiskless index b8ed0600dec1..23d7d5692715 100644 --- a/etc/rc.initdiskless +++ b/etc/rc.initdiskless @@ -28,7 +28,7 @@ # # REQUIRE: preseedrandom # PROVIDE: initdiskless -# KEYWORD: FreeBSD nojail +# KEYWORD: nojail # BEFORE: ipfw diff --git a/etc/rc.shutdown b/etc/rc.shutdown index fa00feb0e049..2f5a753225a8 100644 --- a/etc/rc.shutdown +++ b/etc/rc.shutdown @@ -79,10 +79,8 @@ fi # Determine the shutdown order of the /etc/rc.d scripts, # and perform the operation -# XXX - rcorder(8) with multiple -k switches works as a logical OR, -# so, we can't do this: rcorder -k shutdown -k FreeBSD. # -files=`eval grep -l \'^# KEYWORD:.*FreeBSD\' \`rcorder -k shutdown /etc/rc.d/* 2>/dev/null\`` +files=`rcorder -k shutdown /etc/rc.d/* 2>/dev/null` for _rc_elem in `reverse_list $files`; do debug "run_rc_script $_rc_elem faststop" -- cgit v1.2.3