Luke Mewburn has indicated that they (NetBSD) are not interested

in keeping the scripts under rc.d in sync with us. So, begin removal of NetBSD specific stuff (which made our scripts more complicated than necessary), starting with the NetBSD KEYWORD.
svn path=/head/; revision=124616
2004-01-17 10:16:38 +00:00 · 2004-01-17 10:16:38 +00:00 · 1afce00360 · 2020-12-20 02:59:44 +00:00
commit 1afce00360
parent 898fc4a340
56 changed files with 56 additions and 56 deletions
--- a/etc/rc.d/DAEMON
+++ b/etc/rc.d/DAEMON
@ -6,7 +6,7 @@

 # PROVIDE: DAEMON
 # REQUIRE: NETWORKING SERVERS
-# KEYWORD: FreeBSD NetBSD
+# KEYWORD: FreeBSD

 #	This is a dummy dependency, to ensure that general purpose daemons
 #	are run _after_ the above are.
--- a/etc/rc.d/LOGIN
+++ b/etc/rc.d/LOGIN
@ -6,7 +6,7 @@

 # PROVIDE: LOGIN
 # REQUIRE: DAEMON
-# KEYWORD: FreeBSD NetBSD
+# 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
--- a/etc/rc.d/NETWORKING
+++ b/etc/rc.d/NETWORKING
@ -7,7 +7,7 @@
 # PROVIDE: NETWORKING NETWORK
 # REQUIRE: network dhclient altqd netif routing network_ipv6 isdnd ppp-user
 # REQUIRE: routed mrouted route6d mroute6d
-# KEYWORD: FreeBSD NetBSD
+# KEYWORD: FreeBSD

 #	This is a dummy dependency, for services which require networking
 #	to be operational before starting.
--- a/etc/rc.d/SERVERS
+++ b/etc/rc.d/SERVERS
@ -6,7 +6,7 @@

 # PROVIDE: SERVERS
 # REQUIRE: mountcritremote
-# KEYWORD: FreeBSD NetBSD
+# KEYWORD: FreeBSD

 #	This is a dummy dependency, for early-start servers relying on
 #	some basic configuration.
--- a/etc/rc.d/accounting
+++ b/etc/rc.d/accounting
@ -7,7 +7,7 @@
 # PROVIDE: accounting
 # REQUIRE: mountall
 # BEFORE: DAEMON
-# KEYWORD: FreeBSD NetBSD
+# KEYWORD: FreeBSD

 . /etc/rc.subr

--- a/etc/rc.d/amd
+++ b/etc/rc.d/amd
@ -7,7 +7,7 @@
 # PROVIDE: amd
 # REQUIRE: rpcbind mountall ypbind nfsclient
 # BEFORE: DAEMON
-# KEYWORD: FreeBSD NetBSD
+# KEYWORD: FreeBSD

 . /etc/rc.subr

--- a/etc/rc.d/apmd
+++ b/etc/rc.d/apmd
@ -7,7 +7,7 @@
 # PROVIDE: apmd
 # REQUIRE: DAEMON apm
 # BEFORE:  LOGIN
-# KEYWORD: FreeBSD NetBSD
+# KEYWORD: FreeBSD

 . /etc/rc.subr

--- a/etc/rc.d/ccd
+++ b/etc/rc.d/ccd
@ -5,7 +5,7 @@
 #

 # PROVIDE: disks
-# KEYWORD: FreeBSD NetBSD
+# KEYWORD: FreeBSD

 . /etc/rc.subr

--- a/etc/rc.d/cleartmp
+++ b/etc/rc.d/cleartmp
@ -7,7 +7,7 @@
 # PROVIDE: cleartmp
 # REQUIRE: mountall
 # BEFORE: DAEMON
-# KEYWORD: FreeBSD NetBSD
+# KEYWORD: FreeBSD

 . /etc/rc.subr

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

 . /etc/rc.subr

--- a/etc/rc.d/dhclient
+++ b/etc/rc.d/dhclient
@ -7,7 +7,7 @@
 # PROVIDE: dhclient
 # REQUIRE: network netif mountcritlocal
 # BEFORE:  NETWORKING
-# KEYWORD: FreeBSD NetBSD
+# KEYWORD: FreeBSD
 #
 #	Note that there no syslog logging of dhclient messages at boot because
 #	dhclient needs to start before services that syslog depends upon do.
--- a/etc/rc.d/fsck
+++ b/etc/rc.d/fsck
@ -6,7 +6,7 @@

 # PROVIDE: fsck
 # REQUIRE: localswap
-# KEYWORD: FreeBSD NetBSD
+# KEYWORD: FreeBSD

 . /etc/rc.subr

--- a/etc/rc.d/inetd
+++ b/etc/rc.d/inetd
@ -6,7 +6,7 @@

 # PROVIDE: inetd
 # REQUIRE: DAEMON LOGIN
-# KEYWORD: FreeBSD NetBSD shutdown
+# KEYWORD: FreeBSD shutdown

 . /etc/rc.subr

--- a/etc/rc.d/ipfilter
+++ b/etc/rc.d/ipfilter
@ -7,7 +7,7 @@
 # PROVIDE: ipfilter
 # REQUIRE: root beforenetlkm mountcritlocal ipmon
 # BEFORE:  netif
-# KEYWORD: FreeBSD NetBSD
+# KEYWORD: FreeBSD

 . /etc/rc.subr

--- a/etc/rc.d/ipfs
+++ b/etc/rc.d/ipfs
@ -7,7 +7,7 @@
 # PROVIDE: ipfs
 # REQUIRE: ipnat
 # BEFORE:  netif
-# KEYWORD: FreeBSD NetBSD shutdown
+# KEYWORD: FreeBSD shutdown

 . /etc/rc.subr

--- a/etc/rc.d/ipmon
+++ b/etc/rc.d/ipmon
@ -7,7 +7,7 @@
 # PROVIDE: ipmon
 # REQUIRE: mountcritlocal hostname sysctl cleanvar
 # BEFORE:  SERVERS
-# KEYWORD: FreeBSD NetBSD
+# KEYWORD: FreeBSD

 . /etc/rc.subr

--- a/etc/rc.d/ipnat
+++ b/etc/rc.d/ipnat
@ -7,7 +7,7 @@
 # PROVIDE: ipnat
 # REQUIRE: ipfilter
 # BEFORE:  DAEMON netif
-# KEYWORD: FreeBSD NetBSD
+# KEYWORD: FreeBSD

 . /etc/rc.subr

--- a/etc/rc.d/ipsec
+++ b/etc/rc.d/ipsec
@ -7,7 +7,7 @@
 # PROVIDE: ipsec
 # REQUIRE: root beforenetlkm mountcritlocal
 # BEFORE:  DAEMON
-# KEYWORD: FreeBSD NetBSD
+# KEYWORD: FreeBSD

 #	it does not really require beforenetlkm.

--- a/etc/rc.d/isdnd
+++ b/etc/rc.d/isdnd
@ -8,7 +8,7 @@

 # PROVIDE: isdnd
 # REQUIRE: netif mountcritlocal
-# KEYWORD: FreeBSD NetBSD
+# KEYWORD: FreeBSD

 . /etc/rc.subr

--- a/etc/rc.d/ldconfig
+++ b/etc/rc.d/ldconfig
@ -7,7 +7,7 @@
 # PROVIDE: ldconfig
 # REQUIRE: mountall mountcritremote
 # BEFORE:  DAEMON
-# KEYWORD: FreeBSD NetBSD
+# KEYWORD: FreeBSD

 . /etc/rc.subr

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

 . /etc/rc.subr

--- a/etc/rc.d/lockd
+++ b/etc/rc.d/lockd
@ -7,7 +7,7 @@
 # PROVIDE: nfslocking
 # REQUIRE: nfsserver nfsclient nfsd
 # BEFORE:  DAEMON
-# KEYWORD: FreeBSD NetBSD
+# KEYWORD: FreeBSD

 . /etc/rc.subr

--- a/etc/rc.d/lpd
+++ b/etc/rc.d/lpd
@ -7,7 +7,7 @@
 # PROVIDE: lpd
 # REQUIRE: DAEMON
 # BEFORE:  LOGIN
-# KEYWORD: FreeBSD NetBSD
+# KEYWORD: FreeBSD

 . /etc/rc.subr

--- a/etc/rc.d/motd
+++ b/etc/rc.d/motd
@ -7,7 +7,7 @@
 # PROVIDE: motd
 # REQUIRE: mountcritremote
 # BEFORE:  LOGIN
-# KEYWORD: FreeBSD NetBSD
+# KEYWORD: FreeBSD

 . /etc/rc.subr

--- a/etc/rc.d/mountcritlocal
+++ b/etc/rc.d/mountcritlocal
@ -6,7 +6,7 @@

 # PROVIDE: mountcritlocal
 # REQUIRE: root
-# KEYWORD: FreeBSD NetBSD
+# KEYWORD: FreeBSD

 . /etc/rc.subr

--- a/etc/rc.d/mountcritremote
+++ b/etc/rc.d/mountcritremote
@ -6,7 +6,7 @@

 # PROVIDE: mountcritremote
 # REQUIRE: NETWORKING root mountcritlocal
-# KEYWORD: FreeBSD NetBSD
+# KEYWORD: FreeBSD

 . /etc/rc.subr

--- a/etc/rc.d/mountd
+++ b/etc/rc.d/mountd
@ -6,7 +6,7 @@

 # PROVIDE: mountd
 # REQUIRE: NETWORKING mountall beforemountlkm nfsserver rpcbind quota
-# KEYWORD: FreeBSD NetBSD
+# KEYWORD: FreeBSD

 . /etc/rc.subr

--- a/etc/rc.d/moused
+++ b/etc/rc.d/moused
@ -6,7 +6,7 @@

 # PROVIDE: moused
 # REQUIRE: DAEMON
-# KEYWORD: FreeBSD NetBSD
+# KEYWORD: FreeBSD

 . /etc/rc.subr

--- a/etc/rc.d/mrouted
+++ b/etc/rc.d/mrouted
@ -6,7 +6,7 @@

 # PROVIDE: mrouted
 # REQUIRE: netif routing
-# KEYWORD: FreeBSD NetBSD
+# KEYWORD: FreeBSD

 . /etc/rc.subr

--- a/etc/rc.d/named
+++ b/etc/rc.d/named
@ -7,7 +7,7 @@
 # PROVIDE: named
 # REQUIRE: SERVERS
 # BEFORE:  DAEMON
-# KEYWORD: FreeBSD NetBSD
+# KEYWORD: FreeBSD

 . /etc/rc.subr

--- a/etc/rc.d/nfsd
+++ b/etc/rc.d/nfsd
@ -6,7 +6,7 @@

 # PROVIDE: nfsd
 # REQUIRE: mountd
-# KEYWORD: FreeBSD NetBSD
+# KEYWORD: FreeBSD

 . /etc/rc.subr

--- a/etc/rc.d/nfslocking
+++ b/etc/rc.d/nfslocking
@ -7,7 +7,7 @@
 # PROVIDE: nfslocking
 # REQUIRE: nfsserver nfsclient nfsd
 # BEFORE:  DAEMON
-# KEYWORD: FreeBSD NetBSD
+# KEYWORD: FreeBSD

 . /etc/rc.subr

--- a/etc/rc.d/ntpd
+++ b/etc/rc.d/ntpd
@ -7,7 +7,7 @@
 # PROVIDE: ntpd
 # REQUIRE: DAEMON
 # BEFORE:  LOGIN
-# KEYWORD: FreeBSD NetBSD
+# KEYWORD: FreeBSD

 . /etc/rc.subr

--- a/etc/rc.d/ntpdate
+++ b/etc/rc.d/ntpdate
@ -6,7 +6,7 @@

 # PROVIDE: ntpdate
 # REQUIRE: NETWORKING syslogd
-# KEYWORD: FreeBSD NetBSD
+# KEYWORD: FreeBSD

 . /etc/rc.subr

--- a/etc/rc.d/pwcheck
+++ b/etc/rc.d/pwcheck
@ -7,7 +7,7 @@
 # PROVIDE: pwcheck
 # REQUIRE: mountcritremote syslogd
 # BEFORE:  DAEMON
-# KEYWORD: FreeBSD NetBSD
+# KEYWORD: FreeBSD

 . /etc/rc.subr

--- a/etc/rc.d/rarpd
+++ b/etc/rc.d/rarpd
@ -7,7 +7,7 @@
 # PROVIDE: rarpd
 # REQUIRE: DAEMON
 # BEFORE:  LOGIN
-# KEYWORD: FreeBSD NetBSD
+# KEYWORD: FreeBSD

 . /etc/rc.subr

--- a/etc/rc.d/root
+++ b/etc/rc.d/root
@ -6,7 +6,7 @@

 # PROVIDE: root
 # REQUIRE: fsck
-# KEYWORD: FreeBSD NetBSD
+# KEYWORD: FreeBSD

 . /etc/rc.subr

--- a/etc/rc.d/route6d
+++ b/etc/rc.d/route6d
@ -6,7 +6,7 @@

 # PROVIDE: route6d
 # REQUIRE: network_ipv6
-# KEYWORD: FreeBSD NetBSD
+# KEYWORD: FreeBSD

 . /etc/rc.subr

--- a/etc/rc.d/routed
+++ b/etc/rc.d/routed
@ -6,7 +6,7 @@

 # PROVIDE: routed
 # REQUIRE: netif routing
-# KEYWORD: FreeBSD NetBSD
+# KEYWORD: FreeBSD

 . /etc/rc.subr

--- a/etc/rc.d/rpcbind
+++ b/etc/rc.d/rpcbind
@ -6,7 +6,7 @@

 # PROVIDE: rpcbind
 # REQUIRE: NETWORKING ntpdate syslogd named ppp
-# KEYWORD: FreeBSD NetBSD
+# KEYWORD: FreeBSD

 . /etc/rc.subr

--- a/etc/rc.d/rtadvd
+++ b/etc/rc.d/rtadvd
@ -7,7 +7,7 @@
 # PROVIDE: rtadvd
 # REQUIRE: DAEMON
 # BEFORE:  LOGIN
-# KEYWORD: FreeBSD NetBSD
+# KEYWORD: FreeBSD

 . /etc/rc.subr

--- a/etc/rc.d/rwho
+++ b/etc/rc.d/rwho
@ -7,7 +7,7 @@
 # PROVIDE: rwho
 # REQUIRE: DAEMON
 # BEFORE:  LOGIN
-# KEYWORD: FreeBSD NetBSD
+# KEYWORD: FreeBSD

 . /etc/rc.subr

--- a/etc/rc.d/savecore
+++ b/etc/rc.d/savecore
@ -7,7 +7,7 @@
 # PROVIDE: savecore
 # REQUIRE: syslogd
 # BEFORE:  SERVERS
-# KEYWORD: FreeBSD NetBSD
+# KEYWORD: FreeBSD

 . /etc/rc.subr

--- a/etc/rc.d/securelevel
+++ b/etc/rc.d/securelevel
@ -5,7 +5,7 @@
 #

 # PROVIDE: securelevel
-# KEYWORD: FreeBSD NetBSD
+# KEYWORD: FreeBSD

 . /etc/rc.subr

--- a/etc/rc.d/sendmail
+++ b/etc/rc.d/sendmail
@ -6,7 +6,7 @@

 # PROVIDE: mail
 # REQUIRE: LOGIN
-# KEYWORD: FreeBSD NetBSD
+# KEYWORD: FreeBSD
 #	we make mail start late, so that things like .forward's are not
 #	processed until the system is fully operational

--- a/etc/rc.d/sshd
+++ b/etc/rc.d/sshd
@ -6,7 +6,7 @@

 # PROVIDE: sshd
 # REQUIRE: LOGIN
-# KEYWORD: FreeBSD NetBSD
+# KEYWORD: FreeBSD

 . /etc/rc.subr

--- a/etc/rc.d/statd
+++ b/etc/rc.d/statd
@ -7,7 +7,7 @@
 # PROVIDE: nfslocking
 # REQUIRE: nfsserver nfsclient nfsd
 # BEFORE:  DAEMON
-# KEYWORD: FreeBSD NetBSD
+# KEYWORD: FreeBSD

 . /etc/rc.subr

--- a/etc/rc.d/swap1
+++ b/etc/rc.d/swap1
@ -6,7 +6,7 @@

 # PROVIDE: localswap
 # REQUIRE: disks
-# KEYWORD: FreeBSD NetBSD shutdown
+# KEYWORD: FreeBSD shutdown

 . /etc/rc.subr

--- a/etc/rc.d/sysctl
+++ b/etc/rc.d/sysctl
@ -7,7 +7,7 @@
 # PROVIDE: sysctl
 # REQUIRE: root
 # BEFORE:  DAEMON
-# KEYWORD: FreeBSD NetBSD
+# KEYWORD: FreeBSD

 . /etc/rc.subr

--- a/etc/rc.d/syslogd
+++ b/etc/rc.d/syslogd
@ -7,7 +7,7 @@
 # PROVIDE: syslogd
 # REQUIRE: mountcritremote sysdb wscons
 # BEFORE:  SERVERS
-# KEYWORD: FreeBSD NetBSD
+# KEYWORD: FreeBSD

 . /etc/rc.subr

--- a/etc/rc.d/timed
+++ b/etc/rc.d/timed
@ -7,7 +7,7 @@
 # PROVIDE: timed
 # REQUIRE: DAEMON
 # BEFORE:  LOGIN
-# KEYWORD: FreeBSD NetBSD
+# KEYWORD: FreeBSD

 . /etc/rc.subr

--- a/etc/rc.d/ttys
+++ b/etc/rc.d/ttys
@ -7,7 +7,7 @@
 # PROVIDE: tty
 # REQUIRE: root mountcritremote
 # BEFORE:  SERVERS
-# KEYWORD: FreeBSD NetBSD
+# KEYWORD: FreeBSD

 . /etc/rc.subr

--- a/etc/rc.d/virecover
+++ b/etc/rc.d/virecover
@ -7,7 +7,7 @@
 # PROVIDE: virecover
 # REQUIRE: mountcritremote ldconfig
 # BEFORE:  DAEMON
-# KEYWORD: FreeBSD NetBSD
+# KEYWORD: FreeBSD
 #
 # XXX: should require `mail'!

--- a/etc/rc.d/ypbind
+++ b/etc/rc.d/ypbind
@ -7,7 +7,7 @@
 # PROVIDE: ypbind
 # REQUIRE: ypserv
 # BEFORE:  DAEMON
-# KEYWORD: FreeBSD NetBSD
+# KEYWORD: FreeBSD

 . /etc/rc.subr

--- a/etc/rc.d/yppasswdd
+++ b/etc/rc.d/yppasswdd
@ -7,7 +7,7 @@
 # PROVIDE: yppasswdd
 # REQUIRE: ypserv ypbind
 # BEFORE:  LOGIN
-# KEYWORD: FreeBSD NetBSD
+# KEYWORD: FreeBSD

 . /etc/rc.subr

--- a/etc/rc.d/ypserv
+++ b/etc/rc.d/ypserv
@ -6,7 +6,7 @@

 # PROVIDE: ypserv
 # REQUIRE: rpcbind
-# KEYWORD: FreeBSD NetBSD
+# KEYWORD: FreeBSD

 . /etc/rc.subr