diff options
| author | mtm <mtm@FreeBSD.org> | 2004-10-07 13:55:26 +0000 |
|---|---|---|
| committer | mtm <mtm@FreeBSD.org> | 2004-10-07 13:55:26 +0000 |
| commit | 39d3f406ce8264b6b5a65bffdc96aa7a04975459 (patch) | |
| tree | 778cc660ba9a1c0f593103fef3829ebbf587298d | |
| parent | 3b8ee1c51209b3fa49c0bfb26aba3d04f6f4cd35 (diff) | |
| download | FreeBSD-src-39d3f406ce8264b6b5a65bffdc96aa7a04975459.zip FreeBSD-src-39d3f406ce8264b6b5a65bffdc96aa7a04975459.tar.gz | |
Remove the requirement for the FreeBSD keyword as it no longer
makes any sense.
Discussed with: dougb, brooks
MFC after: 3 days
132 files changed, 92 insertions, 134 deletions
@@ -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 78db4df..9541380 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 ec690d9..bf84a33 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 3cfb54c..d74c0b1 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 ea25acb..48b19a5 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 7ff921f..53c5447 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 98e2117..777555d 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 b075faa..8213a90 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 10d7b6a..b420653 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 bc1fd58..e445cf3 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 38576ec..3d15701 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 77a0e5d..22410e1 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 9bd4dbe..da93e8b 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 e867486..dc91700 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 1f43a8e..ffb63c3 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 efe808e..4dbd128 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 e14135e..4b41bcd 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 1e336d3..bcef346 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 19cae472..ce58ac7 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 d1864b7..f2b396f 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 92b47e3..7bde18b 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 e5fc076..f33264f 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 0e4f923..c282f3b 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 01c288d..76c2710 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 dce8717..a317f32 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 54316aa..6e2d552 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 5bb202e..0501d55 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 b3a13d8..aaebe33 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 12de948..82ac8da 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 da27e4a..7d329d2 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 42a9b56..8842d46 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 12de948..82ac8da 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 634add2..3db4e77 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 4470636..267113e 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 6ca3387..d5b3b44 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 b8ed060..23d7d56 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 e418d86..62f7b75 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 552c19c..910580e 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 d6db9ea..36aa295 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 3f59b6c..4fb17fc 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 6e5721b..0adddac 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 2e8100c..eda4437 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 3b8f24c..271b99d 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 32581c5..4298f8e 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 e238ae9..788ff3a 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 910db8f..04d3586 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 b015b6b..9476505 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 addb2e7..bdb797a 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 6715115..1e07938 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 5d4f0f6..6e101e3 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 4419426..6be2127 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 62a4832..8663213 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 5d62878..d7f40ac 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 9dbcbe9..507118c 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 cd96982..da163f6 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 add28fe..fb429c9 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 20b5e08..f8a77e8 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 af16f74..84b5718 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 e286440..8ab3a8c 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 7e9cd04..e5aafea 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 cddaeb9..2b675b5 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 cd937d1..49f1ba9 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 83b6f77..67e60f0 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 b8c6d37..df01242 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 93b564b..9ef5ee5 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 b96c3ee..d733092 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 cfd3fc3..c377276 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 64e73cf..6031acc 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 a4dc42c..808d253 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 53a370d..4bfdcfc 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 44a1bfa..029076c 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 6500fbbe..f932964 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 a434bf3..d474164 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 572904c..b6d4bf1 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 debe06f..62b3e7c 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 20b5e08..f8a77e8 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 280bbda..76531ff 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 1ca4afa..a24f107 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 8ce8507..3ba233b 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 d7c8ce1..2481517 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 a8f1e23..28d6777 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 05236a8..7ab3e63 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 5c4ba82..67604bd 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 ad6f5f6..dd84b0f 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 95c539b..b8a0c75 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 051d4e1..86995e9 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 7e23cf5..45c341a 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 945ffe7..305ee1c 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 945ffe7..305ee1c 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 fd2be8c..b9cfb14 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 14b2378..a563189 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 8d4e8ae..b07c993 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 27ce6a9..8a81f83 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 3ac0cb1..3ac0c42 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 2c287c3..f1fe110 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 e603f31..823db6d 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 4edb3fa..ea51850 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 79d8fdc..a4a3745 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 597e82a..8e2c269 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 ebb3c76..aeb9a98 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 e43a62a..e9861b4 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 e163960..6ecab4f 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 91011c4..dc6da0f 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 8d8d97c..8459535 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 0f3ac70..c21106a 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 27a1923..9a319bb 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 9a5c9e8..e6904b5 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 25c2ac5..8bd5ee1 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 8b15a49..b7ac600 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 4931bb4..17d725b 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 d62b577..d4a183b 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 3ee2b4d..e77ddab 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 20b5e08..f8a77e8 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 29af8e8..6be71b3 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 ac0144f..9d7caf5 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 0cd065f..67d3e06 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 13732f8..ac3c4db 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 82ee57e..016c831 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 a39fd8c..0c7a460 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 87caa74..979589c 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 1f7fa3d..7a4baf4 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 c1e5a2d..af1b095 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 9fd1a8d..9af4151 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 84654db..9dc22a5 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 8c8644c..0ed5cd5 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 8d82d08..4e805f5 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 c5c92e5..54ddd5b 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 df643b3..bf091c1 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 1fedf76..106db0f 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 d39a9c4..100092e 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 b8ed060..23d7d56 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 fa00feb..2f5a753 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" |
