34 files changed, 34 insertions, 19 deletions
diff --git a/etc/rc.d/amd b/etc/rc.d/amd
index 546f652..a0e0dc8 100755
--- 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
 
diff --git a/etc/rc.d/apmd b/etc/rc.d/apmd
index 7b56d2f..c2d6967 100755
--- 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
 
diff --git a/etc/rc.d/bsnmpd b/etc/rc.d/bsnmpd
index e266c3b..c24a08f 100755
--- 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
 
diff --git a/etc/rc.d/bthidd b/etc/rc.d/bthidd
index 5a784f6..907305e 100755
--- 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
 
diff --git a/etc/rc.d/devd b/etc/rc.d/devd
index 7b0df84..8ce575a 100755
--- 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
 
diff --git a/etc/rc.d/ftp-proxy b/etc/rc.d/ftp-proxy
index 4ef40d9..6712e68 100755
--- 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
 
diff --git a/etc/rc.d/ftpd b/etc/rc.d/ftpd
index 4837815..338d735 100755
--- a/etc/rc.d/ftpd
+++ b/etc/rc.d/ftpd
@@ -5,6 +5,7 @@
 
 # PROVIDE: ftpd
 # REQUIRE: LOGIN cleanvar
+# KEYWORD: shutdown
 
 . /etc/rc.subr
 
diff --git a/etc/rc.d/hcsecd b/etc/rc.d/hcsecd
index c78ce9d..fd6a925 100755
--- 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
 
diff --git a/etc/rc.d/idmapd b/etc/rc.d/idmapd
index c5e3886..4c90fd4 100755
--- 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
 
diff --git a/etc/rc.d/keyserv b/etc/rc.d/keyserv
index 5792ad4..72188e0 100755
--- 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
 
diff --git a/etc/rc.d/lockd b/etc/rc.d/lockd
index 809b2ff..1a3fc6b 100755
--- 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
 
diff --git a/etc/rc.d/lpd b/etc/rc.d/lpd
index eae99e8..552e068 100755
--- 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
 
diff --git a/etc/rc.d/mountd b/etc/rc.d/mountd
index 12d441d..6f82601 100755
--- 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
 
diff --git a/etc/rc.d/moused b/etc/rc.d/moused
index 06a013b..ec50789 100755
--- 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
 
diff --git a/etc/rc.d/nfsd b/etc/rc.d/nfsd
index 83ba9cd..b60c5c8 100755
--- 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
 
diff --git a/etc/rc.d/nscd b/etc/rc.d/nscd
index 3eb8823..acf63ab 100755
--- 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:
diff --git a/etc/rc.d/ntpd b/etc/rc.d/ntpd
index d4b738f..7a4eef8 100755
--- 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
 
diff --git a/etc/rc.d/powerd b/etc/rc.d/powerd
index fe7237e..e59d979 100755
--- 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
 
diff --git a/etc/rc.d/rpcbind b/etc/rc.d/rpcbind
index c666108..a30f102 100755
--- 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
 
diff --git a/etc/rc.d/rtadvd b/etc/rc.d/rtadvd
index 8c9dc53..0d3c9d3 100755
--- 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
 
diff --git a/etc/rc.d/rwho b/etc/rc.d/rwho
index 665bab3..e088d99 100755
--- 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
 
diff --git a/etc/rc.d/sdpd b/etc/rc.d/sdpd
index ccf2257..acaf380 100755
--- 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
 
diff --git a/etc/rc.d/sendmail b/etc/rc.d/sendmail
index 7814d1f..dfaa8e0 100755
--- 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.
diff --git a/etc/rc.d/sshd b/etc/rc.d/sshd
index 84f1ef2..fd95d5a 100755
--- a/etc/rc.d/sshd
+++ b/etc/rc.d/sshd
@@ -5,6 +5,7 @@
 
 # PROVIDE: sshd
 # REQUIRE: LOGIN cleanvar
+# KEYWORD: shutdown
 
 . /etc/rc.subr
 
diff --git a/etc/rc.d/statd b/etc/rc.d/statd
index bdb4095..85e003d 100755
--- 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
 
diff --git a/etc/rc.d/timed b/etc/rc.d/timed
index bd7d8c1..d1cf1a2 100755
--- 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
 
diff --git a/etc/rc.d/ugidfw b/etc/rc.d/ugidfw
index 01632c9..d65d6a3 100755
--- 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
 
diff --git a/etc/rc.d/watchdogd b/etc/rc.d/watchdogd
index 3e12f54..e852126 100755
--- 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
 
diff --git a/etc/rc.d/ypbind b/etc/rc.d/ypbind
index edf15b9..4dbf351 100755
--- 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
 
diff --git a/etc/rc.d/yppasswdd b/etc/rc.d/yppasswdd
index 86e38ed..dcaa2f8 100755
--- 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
 
diff --git a/etc/rc.d/ypserv b/etc/rc.d/ypserv
index 1c056b9..8e17fd7 100755
--- a/etc/rc.d/ypserv
+++ b/etc/rc.d/ypserv
@@ -5,6 +5,7 @@
 
 # PROVIDE: ypserv
 # REQUIRE: rpcbind
+# KEYWORD: shutdown
 
 . /etc/rc.subr
 
diff --git a/etc/rc.d/ypset b/etc/rc.d/ypset
index bc2c154..78c408b 100755
--- a/etc/rc.d/ypset
+++ b/etc/rc.d/ypset
@@ -5,6 +5,7 @@
 
 # PROVIDE: ypset
 # REQUIRE: ypbind
+# KEYWORD: shutdown
 
 . /etc/rc.subr
 
diff --git a/etc/rc.d/ypupdated b/etc/rc.d/ypupdated
index e1d6fd7..98ef203 100755
--- a/etc/rc.d/ypupdated
+++ b/etc/rc.d/ypupdated
@@ -5,6 +5,7 @@
 
 # PROVIDE: ypupdated
 # REQUIRE: rpcbind ypserv
+# KEYWORD: shutdown
 
 . /etc/rc.subr
 
diff --git a/etc/rc.d/ypxfrd b/etc/rc.d/ypxfrd
index dd9488a..f125a30 100755
--- a/etc/rc.d/ypxfrd
+++ b/etc/rc.d/ypxfrd
@@ -5,6 +5,7 @@
 
 # PROVIDE: ypxfrd
 # REQUIRE: rpcbind ypserv
+# KEYWORD: shutdown
 
 . /etc/rc.subr