Add the shutdown KEYWORD to those scripts that start persistent services

to allow them to do a "clean" shutdown. I purposely avoided making changes to network-related stuff since the system shutting down is pretty conclusive, and there may be complicated dependencies on the network that I would rather not try to unravel. I also skipped kerberos-related stuff for the reasons above, and because I have no way to test it.
svn path=/head/; revision=180564
2024-11-27 08:00:11 +00:00 · 2008-07-16 19:50:29 +00:00 · 2008-07-16 19:50:29 +00:00 · 04f0f225dd · 2020-12-20 02:59:44 +00:00
commit 04f0f225dd
parent 2b9851690c
34 changed files with 34 additions and 19 deletions
--- a/etc/rc.d/amd
+++ b/etc/rc.d/amd
@ -6,7 +6,7 @@
 # PROVIDE: amd
 # REQUIRE: rpcbind ypbind nfsclient cleanvar ldconfig
 # BEFORE: DAEMON
-# KEYWORD: nojail
+# KEYWORD: nojail shutdown

 . /etc/rc.subr

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

 . /etc/rc.subr

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

 # PROVIDE: bsnmpd
 # REQUIRE: NETWORKING syslogd
-# KEYWORD: nojail
+# KEYWORD: nojail shutdown

 . /etc/rc.subr

--- a/etc/rc.d/bthidd
+++ b/etc/rc.d/bthidd
@ -6,7 +6,7 @@
 # PROVIDE: bthidd
 # REQUIRE: DAEMON hcsecd
 # BEFORE: LOGIN
-# KEYWORD: nojail
+# KEYWORD: nojail shutdown

 . /etc/rc.subr

--- a/etc/rc.d/devd
+++ b/etc/rc.d/devd
@ -6,7 +6,7 @@
 # PROVIDE: devd
 # REQUIRE: netif network_ipv6
 # BEFORE: NETWORKING mountcritremote
-# KEYWORD: nojail
+# KEYWORD: nojail shutdown

 . /etc/rc.subr

--- a/etc/rc.d/ftp-proxy
+++ b/etc/rc.d/ftp-proxy
@ -5,6 +5,7 @@

 # PROVIDE: ftp-proxy
 # REQUIRE: DAEMON pf
+# KEYWORD: shutdown

 . /etc/rc.subr

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

 # PROVIDE: ftpd
 # REQUIRE: LOGIN cleanvar
+# KEYWORD: shutdown

 . /etc/rc.subr

--- a/etc/rc.d/hcsecd
+++ b/etc/rc.d/hcsecd
@ -6,7 +6,7 @@
 # PROVIDE: hcsecd
 # REQUIRE: DAEMON
 # BEFORE: LOGIN
-# KEYWORD: nojail
+# KEYWORD: nojail shutdown

 . /etc/rc.subr

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

 # PROVIDE: idmapd
 # REQUIRE: rpcbind
-# KEYWORD: nojail
+# KEYWORD: nojail shutdown

 . /etc/rc.subr

--- a/etc/rc.d/keyserv
+++ b/etc/rc.d/keyserv
@ -8,6 +8,7 @@
 # PROVIDE: keyserv
 # REQUIRE: ypbind
 # BEFORE: DAEMON
+# KEYWORD: shutdown

 . /etc/rc.subr

--- a/etc/rc.d/lockd
+++ b/etc/rc.d/lockd
@ -7,7 +7,7 @@
 # PROVIDE: lockd
 # REQUIRE: nfsserver nfsclient nfsd rpcbind statd
 # BEFORE:  DAEMON
-# KEYWORD: nojail
+# KEYWORD: nojail shutdown

 . /etc/rc.subr

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

 . /etc/rc.subr

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

 # PROVIDE: mountd
 # REQUIRE: NETWORKING nfsserver rpcbind quota
-# KEYWORD: nojail
+# KEYWORD: nojail shutdown

 . /etc/rc.subr

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

 # PROVIDE: moused
 # REQUIRE: DAEMON cleanvar
-# KEYWORD: nojail
+# KEYWORD: nojail shutdown

 . /etc/rc.subr

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

 # PROVIDE: nfsd
 # REQUIRE: mountd
-# KEYWORD: nojail
+# KEYWORD: nojail shutdown

 . /etc/rc.subr

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

 #
 # Add the following lines to /etc/rc.conf to enable nscd:
--- a/etc/rc.d/ntpd
+++ b/etc/rc.d/ntpd
@ -6,7 +6,7 @@
 # PROVIDE: ntpd
 # REQUIRE: DAEMON ntpdate cleanvar devfs
 # BEFORE:  LOGIN
-# KEYWORD: nojail
+# KEYWORD: nojail shutdown

 . /etc/rc.subr

--- a/etc/rc.d/powerd
+++ b/etc/rc.d/powerd
@ -6,7 +6,7 @@
 # PROVIDE: powerd
 # REQUIRE: DAEMON
 # BEFORE: LOGIN
-# KEYWORD: nojail
+# KEYWORD: nojail shutdown

 . /etc/rc.subr

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

 # PROVIDE: rpcbind
 # REQUIRE: NETWORKING ntpdate syslogd named
+# KEYWORD: shutdown

 . /etc/rc.subr

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

 . /etc/rc.subr

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

 . /etc/rc.subr

--- a/etc/rc.d/sdpd
+++ b/etc/rc.d/sdpd
@ -6,7 +6,7 @@
 # PROVIDE: sdpd
 # REQUIRE: DAEMON
 # BEFORE: LOGIN
-# KEYWORD: nojail
+# KEYWORD: nojail shutdown

 . /etc/rc.subr

--- a/etc/rc.d/sendmail
+++ b/etc/rc.d/sendmail
@ -7,6 +7,7 @@
 # REQUIRE: LOGIN cleanvar
 #	we make mail start late, so that things like .forward's are not
 #	processed until the system is fully operational
+# KEYWORD: shutdown

 # XXX - Get together with sendmail mantainer to figure out how to
 #	better handle SENDMAIL_ENABLE and 3rd party MTAs.
--- a/etc/rc.d/sshd
+++ b/etc/rc.d/sshd
@ -5,6 +5,7 @@

 # PROVIDE: sshd
 # REQUIRE: LOGIN cleanvar
+# KEYWORD: shutdown

 . /etc/rc.subr

--- a/etc/rc.d/statd
+++ b/etc/rc.d/statd
@ -7,7 +7,7 @@
 # PROVIDE: statd
 # REQUIRE: nfsserver nfsclient nfsd rpcbind
 # BEFORE:  DAEMON
-# KEYWORD: nojail
+# KEYWORD: nojail shutdown

 . /etc/rc.subr

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

 . /etc/rc.subr

--- a/etc/rc.d/ugidfw
+++ b/etc/rc.d/ugidfw
@ -4,7 +4,7 @@

 # PROVIDE: ugidfw
 # BEFORE: LOGIN
-# KEYWORD: nojail
+# KEYWORD: nojail shutdown

 . /etc/rc.subr

--- a/etc/rc.d/watchdogd
+++ b/etc/rc.d/watchdogd
@ -29,7 +29,7 @@

 # PROVIDE: watchdogd
 # REQUIRE: DAEMON cleanvar
-# KEYWORD: nojail
+# KEYWORD: nojail shutdown

 . /etc/rc.subr

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

 . /etc/rc.subr

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

 . /etc/rc.subr

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

 # PROVIDE: ypserv
 # REQUIRE: rpcbind
+# KEYWORD: shutdown

 . /etc/rc.subr

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

 # PROVIDE: ypset
 # REQUIRE: ypbind
+# KEYWORD: shutdown

 . /etc/rc.subr

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

 # PROVIDE: ypupdated
 # REQUIRE: rpcbind ypserv
+# KEYWORD: shutdown

 . /etc/rc.subr

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

 # PROVIDE: ypxfrd
 # REQUIRE: rpcbind ypserv
+# KEYWORD: shutdown

 . /etc/rc.subr