aboutsummaryrefslogtreecommitdiff
path: root/etc
diff options
context:
space:
mode:
authorDavid E. O'Brien <obrien@FreeBSD.org>2012-09-11 05:04:59 +0000
committerDavid E. O'Brien <obrien@FreeBSD.org>2012-09-11 05:04:59 +0000
commit8801556beb2c13ba0c9b253045f8492cc1265b44 (patch)
tree7597d37e5f2656125be99b298de4120f1f8148d5 /etc
parent915e341bac689d8431f98bf1e7fb58edd975755d (diff)
downloadsrc-8801556beb2c13ba0c9b253045f8492cc1265b44.tar.gz
src-8801556beb2c13ba0c9b253045f8492cc1265b44.zip
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.
Notes
Notes: svn path=/head/; revision=240336
Diffstat (limited to 'etc')
-rwxr-xr-xetc/rc.d/FILESYSTEMS2
-rwxr-xr-xetc/rc.d/addswap1
-rwxr-xr-xetc/rc.d/amd2
-rwxr-xr-xetc/rc.d/cleanvar2
-rwxr-xr-xetc/rc.d/cron2
-rwxr-xr-xetc/rc.d/dmesg2
-rwxr-xr-xetc/rc.d/ftpd2
-rwxr-xr-xetc/rc.d/inetd2
-rwxr-xr-xetc/rc.d/ipmon2
-rwxr-xr-xetc/rc.d/jail2
-rwxr-xr-xetc/rc.d/ldconfig2
-rwxr-xr-xetc/rc.d/mixer2
-rwxr-xr-xetc/rc.d/mountcritremote2
-rwxr-xr-xetc/rc.d/moused2
-rwxr-xr-xetc/rc.d/mrouted2
-rwxr-xr-xetc/rc.d/named2
-rwxr-xr-xetc/rc.d/netif2
-rwxr-xr-xetc/rc.d/newsyslog2
-rwxr-xr-xetc/rc.d/ntpd2
-rwxr-xr-xetc/rc.d/pflog2
-rwxr-xr-xetc/rc.d/postrandom2
-rwxr-xr-xetc/rc.d/random2
-rwxr-xr-xetc/rc.d/rarpd2
-rwxr-xr-xetc/rc.d/resolv2
-rwxr-xr-xetc/rc.d/sendmail2
-rwxr-xr-xetc/rc.d/sshd2
-rwxr-xr-xetc/rc.d/syslogd2
-rwxr-xr-xetc/rc.d/utx2
-rwxr-xr-xetc/rc.d/var4
-rwxr-xr-xetc/rc.d/watchdogd2
30 files changed, 32 insertions, 29 deletions
diff --git a/etc/rc.d/FILESYSTEMS b/etc/rc.d/FILESYSTEMS
index ba2a2d6ea91d..738c28f22299 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 78a45c556541..8dec45665495 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 2ed70ebfb106..377576035d9d 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 95dc77e051f1..c1e90d5e5c6b 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 afc8df4b225d..e2776ba6b0bc 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 697cae9d2761..7a9624a418ed 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 c862586424c1..c7efe67c0efb 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 d4e97eda1340..5a32e1c7c9fc 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 45e91fbeb31f..27f483c97468 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 8bfa3176c1c3..0718fa833619 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 54114a6a6980..2dbb5b41f063 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 cc7fb2d749c0..0719441ad7ce 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 62e5079defd6..feb1b78a52ad 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 6e71f441dbc9..57419a0a7810 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 b3c091863706..d15299f35ce1 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 31743283d85c..b55bde3a88ab 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 284e30ac7d18..19b857fd7bfc 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 5dc406600582..a9d9b60b5f67 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 ef2f6d4353dd..3935b295ed40 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 e5511fca62e3..a0e6876b4350 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 0ae76d61897b..006d56342fe8 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 8d9fd44c9d90..8499522986e0 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 9dffe4302fb2..334029346ba4 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 aa7921fa1fc6..debd3aa9020b 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 680020f13dcc..7c3f6606fba2 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 a9321594a6a4..19b47d83df2f 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 118995ed5815..e68e50607de4 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 e23ae008eb8f..12f1f6aea471 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 2b4121985eff..2be24842bd0d 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 d3c0d9c4d15d..bba1635d80db 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-10-20 21:50:34 +0000