Simply things so that "#REQUIRE: FILESYSTEMS" means the file

systems are fully "ready to go".

'FILESYSTEMS' states: "This is a dummy dependency, for services which
require file systems to be mounted before starting."  However, we have
'var' which is was run after 'FILESYSTEMS' and can mount /var if it
already isn't mounted.  Furthermore, several scripts cannot use /var
until 'cleanvar' has done its thing.  Thus "FILESYSTEMS" hasn't really
meant all critical file systems are fully usable.

30 files changed, 32 insertions, 29 deletions

diff --git a/etc/rc.d/FILESYSTEMS b/etc/rc.d/FILESYSTEMS
index ba2a2d6..738c28f 100755
--- a/etc/rc.d/FILESYSTEMS
+++ b/etc/rc.d/FILESYSTEMS
@@ -4,7 +4,7 @@
 #
 
 # PROVIDE: FILESYSTEMS
-# REQUIRE: root mountcritlocal zfs
+# REQUIRE: root mountcritlocal cleanvar zfs
 
 #	This is a dummy dependency, for services which require file systems
 #	to be mounted before starting.  It also serves as the default early /
diff --git a/etc/rc.d/addswap b/etc/rc.d/addswap
index 78a45c5..8dec456 100755
--- a/etc/rc.d/addswap
+++ b/etc/rc.d/addswap
@@ -7,6 +7,7 @@
 
 # PROVIDE: addswap
 # REQUIRE: FILESYSTEMS kld
+# BEFORE:  netif
 # KEYWORD: nojail
 
 . /etc/rc.subr
diff --git a/etc/rc.d/amd b/etc/rc.d/amd
index 2ed70eb..3775760 100755
--- a/etc/rc.d/amd
+++ b/etc/rc.d/amd
@@ -4,7 +4,7 @@
 #
 
 # PROVIDE: amd
-# REQUIRE: rpcbind ypset nfsclient cleanvar ldconfig
+# REQUIRE: rpcbind ypset nfsclient FILESYSTEMS ldconfig
 # BEFORE: DAEMON
 # KEYWORD: nojail shutdown
 
diff --git a/etc/rc.d/cleanvar b/etc/rc.d/cleanvar
index 95dc77e..c1e90d5 100755
--- a/etc/rc.d/cleanvar
+++ b/etc/rc.d/cleanvar
@@ -4,7 +4,7 @@
 #
 
 # PROVIDE: cleanvar
-# REQUIRE: FILESYSTEMS var
+# REQUIRE: var
 
 . /etc/rc.subr
 
diff --git a/etc/rc.d/cron b/etc/rc.d/cron
index afc8df4..e2776ba 100755
--- a/etc/rc.d/cron
+++ b/etc/rc.d/cron
@@ -4,7 +4,7 @@
 #
 
 # PROVIDE: cron
-# REQUIRE: LOGIN cleanvar
+# REQUIRE: LOGIN FILESYSTEMS
 # BEFORE: securelevel
 # KEYWORD: shutdown
 
diff --git a/etc/rc.d/dmesg b/etc/rc.d/dmesg
index 697cae9..7a9624a 100755
--- a/etc/rc.d/dmesg
+++ b/etc/rc.d/dmesg
@@ -4,7 +4,7 @@
 #
 
 # PROVIDE: dmesg
-# REQUIRE: mountcritremote cleanvar
+# REQUIRE: mountcritremote FILESYSTEMS
 # BEFORE:  DAEMON
 # KEYWORD: nojail
 
diff --git a/etc/rc.d/ftpd b/etc/rc.d/ftpd
index c862586..c7efe67 100755
--- a/etc/rc.d/ftpd
+++ b/etc/rc.d/ftpd
@@ -4,7 +4,7 @@
 #
 
 # PROVIDE: ftpd
-# REQUIRE: LOGIN cleanvar
+# REQUIRE: LOGIN FILESYSTEMS
 # KEYWORD: shutdown
 
 . /etc/rc.subr
diff --git a/etc/rc.d/inetd b/etc/rc.d/inetd
index d4e97ed..5a32e1c 100755
--- a/etc/rc.d/inetd
+++ b/etc/rc.d/inetd
@@ -4,7 +4,7 @@
 #
 
 # PROVIDE: inetd
-# REQUIRE: DAEMON LOGIN cleanvar
+# REQUIRE: DAEMON LOGIN FILESYSTEMS
 # KEYWORD: shutdown
 
 . /etc/rc.subr
diff --git a/etc/rc.d/ipmon b/etc/rc.d/ipmon
index 45e91fb..27f483c 100755
--- a/etc/rc.d/ipmon
+++ b/etc/rc.d/ipmon
@@ -4,7 +4,7 @@
 #
 
 # PROVIDE: ipmon
-# REQUIRE: FILESYSTEMS hostname sysctl cleanvar ipfilter
+# REQUIRE: FILESYSTEMS hostname sysctl FILESYSTEMS ipfilter
 # BEFORE:  SERVERS
 # KEYWORD: nojail
 
diff --git a/etc/rc.d/jail b/etc/rc.d/jail
index 8bfa317..0718fa8 100755
--- a/etc/rc.d/jail
+++ b/etc/rc.d/jail
@@ -4,7 +4,7 @@
 #
 
 # PROVIDE: jail
-# REQUIRE: LOGIN cleanvar
+# REQUIRE: LOGIN FILESYSTEMS
 # BEFORE: securelevel
 # KEYWORD: nojail shutdown
 
diff --git a/etc/rc.d/ldconfig b/etc/rc.d/ldconfig
index 54114a6..2dbb5b4 100755
--- a/etc/rc.d/ldconfig
+++ b/etc/rc.d/ldconfig
@@ -4,7 +4,7 @@
 #
 
 # PROVIDE: ldconfig
-# REQUIRE: mountcritremote cleanvar
+# REQUIRE: mountcritremote FILESYSTEMS
 # BEFORE:  DAEMON
 
 . /etc/rc.subr
diff --git a/etc/rc.d/mixer b/etc/rc.d/mixer
index cc7fb2d..0719441 100755
--- a/etc/rc.d/mixer
+++ b/etc/rc.d/mixer
@@ -28,7 +28,7 @@
 #
 
 # PROVIDE: mixer
-# REQUIRE: cleanvar
+# REQUIRE: FILESYSTEMS
 # KEYWORD: nojail shutdown
 
 . /etc/rc.subr
diff --git a/etc/rc.d/mountcritremote b/etc/rc.d/mountcritremote
index 62e5079..feb1b78 100755
--- a/etc/rc.d/mountcritremote
+++ b/etc/rc.d/mountcritremote
@@ -4,7 +4,7 @@
 #
 
 # PROVIDE: mountcritremote
-# REQUIRE: NETWORKING FILESYSTEMS cleanvar ipsec netwait
+# REQUIRE: NETWORKING FILESYSTEMS ipsec netwait
 # KEYWORD: nojail
 
 . /etc/rc.subr
diff --git a/etc/rc.d/moused b/etc/rc.d/moused
index 6e71f44..57419a0 100755
--- a/etc/rc.d/moused
+++ b/etc/rc.d/moused
@@ -4,7 +4,7 @@
 #
 
 # PROVIDE: moused
-# REQUIRE: DAEMON cleanvar
+# REQUIRE: DAEMON FILESYSTEMS
 # KEYWORD: nojail shutdown
 
 . /etc/rc.subr
diff --git a/etc/rc.d/mrouted b/etc/rc.d/mrouted
index b3c0918..d15299f 100755
--- a/etc/rc.d/mrouted
+++ b/etc/rc.d/mrouted
@@ -4,7 +4,7 @@
 #
 
 # PROVIDE: mrouted
-# REQUIRE: netif routing cleanvar
+# REQUIRE: netif routing FILESYSTEMS
 # KEYWORD: nojail
 
 . /etc/rc.subr
diff --git a/etc/rc.d/named b/etc/rc.d/named
index 3174328..b55bde3 100755
--- a/etc/rc.d/named
+++ b/etc/rc.d/named
@@ -4,7 +4,7 @@
 #
 
 # PROVIDE: named
-# REQUIRE: SERVERS cleanvar
+# REQUIRE: SERVERS FILESYSTEMS
 # KEYWORD: shutdown
 
 . /etc/rc.subr
diff --git a/etc/rc.d/netif b/etc/rc.d/netif
index 284e30a..19b857f 100755
--- a/etc/rc.d/netif
+++ b/etc/rc.d/netif
@@ -26,7 +26,7 @@
 #
 
 # PROVIDE: netif
-# REQUIRE: atm1 cleanvar FILESYSTEMS serial sppp sysctl
+# REQUIRE: atm1 FILESYSTEMS serial sppp sysctl
 # REQUIRE: ipfilter ipfs
 # KEYWORD: nojail
 
diff --git a/etc/rc.d/newsyslog b/etc/rc.d/newsyslog
index 5dc4066..a9d9b60 100755
--- a/etc/rc.d/newsyslog
+++ b/etc/rc.d/newsyslog
@@ -4,7 +4,7 @@
 #
 
 # PROVIDE: newsyslog
-# REQUIRE: cleanvar mountcritremote
+# REQUIRE: FILESYSTEMS mountcritremote
 
 . /etc/rc.subr
 
diff --git a/etc/rc.d/ntpd b/etc/rc.d/ntpd
index ef2f6d4..3935b29 100755
--- a/etc/rc.d/ntpd
+++ b/etc/rc.d/ntpd
@@ -4,7 +4,7 @@
 #
 
 # PROVIDE: ntpd
-# REQUIRE: DAEMON ntpdate cleanvar devfs
+# REQUIRE: DAEMON ntpdate FILESYSTEMS devfs
 # BEFORE:  LOGIN
 # KEYWORD: nojail shutdown
 
diff --git a/etc/rc.d/pflog b/etc/rc.d/pflog
index e5511fc..a0e6876 100755
--- a/etc/rc.d/pflog
+++ b/etc/rc.d/pflog
@@ -4,7 +4,7 @@
 #
 
 # PROVIDE: pflog
-# REQUIRE: FILESYSTEMS netif cleanvar
+# REQUIRE: FILESYSTEMS netif FILESYSTEMS
 # KEYWORD: nojail
 
 . /etc/rc.subr
diff --git a/etc/rc.d/postrandom b/etc/rc.d/postrandom
index 0ae76d6..006d563 100755
--- a/etc/rc.d/postrandom
+++ b/etc/rc.d/postrandom
@@ -4,7 +4,7 @@
 #
 
 # PROVIDE: postrandom
-# REQUIRE: initrandom random var
+# REQUIRE: initrandom random FILESYSTEMS
 # BEFORE: LOGIN
 # KEYWORD: nojail
 
diff --git a/etc/rc.d/random b/etc/rc.d/random
index 8d9fd44..8499522 100755
--- a/etc/rc.d/random
+++ b/etc/rc.d/random
@@ -4,7 +4,7 @@
 #
 
 # PROVIDE: random
-# REQUIRE: initrandom var
+# REQUIRE: initrandom FILESYSTEMS
 # BEFORE: netif
 # KEYWORD: nojail shutdown
 
diff --git a/etc/rc.d/rarpd b/etc/rc.d/rarpd
index 9dffe43..3340293 100755
--- a/etc/rc.d/rarpd
+++ b/etc/rc.d/rarpd
@@ -4,7 +4,7 @@
 #
 
 # PROVIDE: rarpd
-# REQUIRE: DAEMON cleanvar
+# REQUIRE: DAEMON FILESYSTEMS
 # BEFORE:  LOGIN
 # KEYWORD: nojail
 
diff --git a/etc/rc.d/resolv b/etc/rc.d/resolv
index aa7921f..debd3aa 100755
--- a/etc/rc.d/resolv
+++ b/etc/rc.d/resolv
@@ -28,7 +28,7 @@
 #
 
 # PROVIDE: resolv
-# REQUIRE: netif var
+# REQUIRE: netif FILESYSTEMS
 # KEYWORD: nojail
 
 . /etc/rc.subr
diff --git a/etc/rc.d/sendmail b/etc/rc.d/sendmail
index 680020f..7c3f660 100755
--- a/etc/rc.d/sendmail
+++ b/etc/rc.d/sendmail
@@ -4,7 +4,7 @@
 #
 
 # PROVIDE: mail
-# REQUIRE: LOGIN cleanvar
+# REQUIRE: LOGIN FILESYSTEMS
 #	we make mail start late, so that things like .forward's are not
 #	processed until the system is fully operational
 # KEYWORD: shutdown
diff --git a/etc/rc.d/sshd b/etc/rc.d/sshd
index a932159..19b47d8 100755
--- a/etc/rc.d/sshd
+++ b/etc/rc.d/sshd
@@ -4,7 +4,7 @@
 #
 
 # PROVIDE: sshd
-# REQUIRE: LOGIN cleanvar
+# REQUIRE: LOGIN FILESYSTEMS
 # KEYWORD: shutdown
 
 . /etc/rc.subr
diff --git a/etc/rc.d/syslogd b/etc/rc.d/syslogd
index 118995e..e68e506 100755
--- a/etc/rc.d/syslogd
+++ b/etc/rc.d/syslogd
@@ -4,7 +4,7 @@
 #
 
 # PROVIDE: syslogd
-# REQUIRE: mountcritremote cleanvar newsyslog
+# REQUIRE: mountcritremote FILESYSTEMS newsyslog
 # BEFORE:  SERVERS
 
 . /etc/rc.subr
diff --git a/etc/rc.d/utx b/etc/rc.d/utx
index e23ae00..12f1f6a 100755
--- a/etc/rc.d/utx
+++ b/etc/rc.d/utx
@@ -4,7 +4,7 @@
 #
 
 # PROVIDE: utx
-# REQUIRE: DAEMON cleanvar
+# REQUIRE: DAEMON FILESYSTEMS
 # KEYWORD: shutdown
 
 . /etc/rc.subr
diff --git a/etc/rc.d/var b/etc/rc.d/var
index 2b41219..2be2484 100755
--- a/etc/rc.d/var
+++ b/etc/rc.d/var
@@ -28,7 +28,9 @@
 #
 
 # PROVIDE: var
-# REQUIRE: FILESYSTEMS kld addswap
+# REQUIRE: mountcritlocal zfs
+
+# NFS /var is not supported, unless NFS /var is part of diskless NFS /
 
 . /etc/rc.subr
 
diff --git a/etc/rc.d/watchdogd b/etc/rc.d/watchdogd
index d3c0d9c..bba1635 100755
--- a/etc/rc.d/watchdogd
+++ b/etc/rc.d/watchdogd
@@ -28,7 +28,7 @@
 #
 
 # PROVIDE: watchdogd
-# REQUIRE: FILESYSTEMS cleanvar syslogd
+# REQUIRE: FILESYSTEMS syslogd
 # KEYWORD: nojail shutdown
 
 . /etc/rc.subr