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.

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 /

etc/rc.d/addswap

@@ -7,6 +7,7 @@
 
 # PROVIDE: addswap
 # REQUIRE: FILESYSTEMS kld
+# BEFORE:  netif
 # KEYWORD: nojail
 
 . /etc/rc.subr

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
 

etc/rc.d/cleanvar

@@ -4,7 +4,7 @@
 #
 
 # PROVIDE: cleanvar
-# REQUIRE: FILESYSTEMS var
+# REQUIRE: var
 
 . /etc/rc.subr
 

etc/rc.d/cron

@@ -4,7 +4,7 @@
 #
 
 # PROVIDE: cron
-# REQUIRE: LOGIN cleanvar
+# REQUIRE: LOGIN FILESYSTEMS
 # BEFORE: securelevel
 # KEYWORD: shutdown
 

etc/rc.d/dmesg

@@ -4,7 +4,7 @@
 #
 
 # PROVIDE: dmesg
-# REQUIRE: mountcritremote cleanvar
+# REQUIRE: mountcritremote FILESYSTEMS
 # BEFORE:  DAEMON
 # KEYWORD: nojail
 

etc/rc.d/ftpd

@@ -4,7 +4,7 @@
 #
 
 # PROVIDE: ftpd
-# REQUIRE: LOGIN cleanvar
+# REQUIRE: LOGIN FILESYSTEMS
 # KEYWORD: shutdown
 
 . /etc/rc.subr

etc/rc.d/inetd

@@ -4,7 +4,7 @@
 #
 
 # PROVIDE: inetd
-# REQUIRE: DAEMON LOGIN cleanvar
+# REQUIRE: DAEMON LOGIN FILESYSTEMS
 # KEYWORD: shutdown
 
 . /etc/rc.subr

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
 

etc/rc.d/jail

@@ -4,7 +4,7 @@
 #
 
 # PROVIDE: jail
-# REQUIRE: LOGIN cleanvar
+# REQUIRE: LOGIN FILESYSTEMS
 # BEFORE: securelevel
 # KEYWORD: nojail shutdown
 

etc/rc.d/ldconfig

@@ -4,7 +4,7 @@
 #
 
 # PROVIDE: ldconfig
-# REQUIRE: mountcritremote cleanvar
+# REQUIRE: mountcritremote FILESYSTEMS
 # BEFORE:  DAEMON
 
 . /etc/rc.subr

etc/rc.d/mixer

@@ -28,7 +28,7 @@
 #
 
 # PROVIDE: mixer
-# REQUIRE: cleanvar
+# REQUIRE: FILESYSTEMS
 # KEYWORD: nojail shutdown
 
 . /etc/rc.subr

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

etc/rc.d/moused

@@ -4,7 +4,7 @@
 #
 
 # PROVIDE: moused
-# REQUIRE: DAEMON cleanvar
+# REQUIRE: DAEMON FILESYSTEMS
 # KEYWORD: nojail shutdown
 
 . /etc/rc.subr

etc/rc.d/mrouted

@@ -4,7 +4,7 @@
 #
 
 # PROVIDE: mrouted
-# REQUIRE: netif routing cleanvar
+# REQUIRE: netif routing FILESYSTEMS
 # KEYWORD: nojail
 
 . /etc/rc.subr

etc/rc.d/named

@@ -4,7 +4,7 @@
 #
 
 # PROVIDE: named
-# REQUIRE: SERVERS cleanvar
+# REQUIRE: SERVERS FILESYSTEMS
 # KEYWORD: shutdown
 
 . /etc/rc.subr

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
 

etc/rc.d/newsyslog

@@ -4,7 +4,7 @@
 #
 
 # PROVIDE: newsyslog
-# REQUIRE: cleanvar mountcritremote
+# REQUIRE: FILESYSTEMS mountcritremote
 
 . /etc/rc.subr
 

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
 

etc/rc.d/pflog

@@ -4,7 +4,7 @@
 #
 
 # PROVIDE: pflog
-# REQUIRE: FILESYSTEMS netif cleanvar
+# REQUIRE: FILESYSTEMS netif FILESYSTEMS
 # KEYWORD: nojail
 
 . /etc/rc.subr

etc/rc.d/postrandom

@@ -4,7 +4,7 @@
 #
 
 # PROVIDE: postrandom
-# REQUIRE: initrandom random var
+# REQUIRE: initrandom random FILESYSTEMS
 # BEFORE: LOGIN
 # KEYWORD: nojail
 

etc/rc.d/random

@@ -4,7 +4,7 @@
 #
 
 # PROVIDE: random
-# REQUIRE: initrandom var
+# REQUIRE: initrandom FILESYSTEMS
 # BEFORE: netif
 # KEYWORD: nojail shutdown
 

etc/rc.d/rarpd

@@ -4,7 +4,7 @@
 #
 
 # PROVIDE: rarpd
-# REQUIRE: DAEMON cleanvar
+# REQUIRE: DAEMON FILESYSTEMS
 # BEFORE:  LOGIN
 # KEYWORD: nojail
 

etc/rc.d/resolv

@@ -28,7 +28,7 @@
 #
 
 # PROVIDE: resolv
-# REQUIRE: netif var
+# REQUIRE: netif FILESYSTEMS
 # KEYWORD: nojail
 
 . /etc/rc.subr

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

etc/rc.d/sshd

@@ -4,7 +4,7 @@
 #
 
 # PROVIDE: sshd
-# REQUIRE: LOGIN cleanvar
+# REQUIRE: LOGIN FILESYSTEMS
 # KEYWORD: shutdown
 
 . /etc/rc.subr

etc/rc.d/syslogd

@@ -4,7 +4,7 @@
 #
 
 # PROVIDE: syslogd
-# REQUIRE: mountcritremote cleanvar newsyslog
+# REQUIRE: mountcritremote FILESYSTEMS newsyslog
 # BEFORE:  SERVERS
 
 . /etc/rc.subr

etc/rc.d/utx

@@ -4,7 +4,7 @@
 #
 
 # PROVIDE: utx
-# REQUIRE: DAEMON cleanvar
+# REQUIRE: DAEMON FILESYSTEMS
 # KEYWORD: shutdown
 
 . /etc/rc.subr

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
 

etc/rc.d/watchdogd

@@ -28,7 +28,7 @@
 #
 
 # PROVIDE: watchdogd
-# REQUIRE: FILESYSTEMS cleanvar syslogd
+# REQUIRE: FILESYSTEMS syslogd
 # KEYWORD: nojail shutdown
 
 . /etc/rc.subr