svn commit: r240336 - head/etc/rc.d
David E. O'Brien
obrien at FreeBSD.org
Tue Sep 11 05:05:00 UTC 2012
Author: obrien
Date: Tue Sep 11 05:04:59 2012
New Revision: 240336
URL: http://svn.freebsd.org/changeset/base/240336
Log:
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.
Modified:
head/etc/rc.d/FILESYSTEMS
head/etc/rc.d/addswap
head/etc/rc.d/amd
head/etc/rc.d/cleanvar
head/etc/rc.d/cron
head/etc/rc.d/dmesg
head/etc/rc.d/ftpd
head/etc/rc.d/inetd
head/etc/rc.d/ipmon
head/etc/rc.d/jail
head/etc/rc.d/ldconfig
head/etc/rc.d/mixer
head/etc/rc.d/mountcritremote
head/etc/rc.d/moused
head/etc/rc.d/mrouted
head/etc/rc.d/named
head/etc/rc.d/netif
head/etc/rc.d/newsyslog
head/etc/rc.d/ntpd
head/etc/rc.d/pflog
head/etc/rc.d/postrandom
head/etc/rc.d/random
head/etc/rc.d/rarpd
head/etc/rc.d/resolv
head/etc/rc.d/sendmail
head/etc/rc.d/sshd
head/etc/rc.d/syslogd
head/etc/rc.d/utx
head/etc/rc.d/var
head/etc/rc.d/watchdogd
Modified: head/etc/rc.d/FILESYSTEMS
==============================================================================
--- head/etc/rc.d/FILESYSTEMS Tue Sep 11 04:54:44 2012 (r240335)
+++ head/etc/rc.d/FILESYSTEMS Tue Sep 11 05:04:59 2012 (r240336)
@@ -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 /
Modified: head/etc/rc.d/addswap
==============================================================================
--- head/etc/rc.d/addswap Tue Sep 11 04:54:44 2012 (r240335)
+++ head/etc/rc.d/addswap Tue Sep 11 05:04:59 2012 (r240336)
@@ -7,6 +7,7 @@
# PROVIDE: addswap
# REQUIRE: FILESYSTEMS kld
+# BEFORE: netif
# KEYWORD: nojail
. /etc/rc.subr
Modified: head/etc/rc.d/amd
==============================================================================
--- head/etc/rc.d/amd Tue Sep 11 04:54:44 2012 (r240335)
+++ head/etc/rc.d/amd Tue Sep 11 05:04:59 2012 (r240336)
@@ -4,7 +4,7 @@
#
# PROVIDE: amd
-# REQUIRE: rpcbind ypset nfsclient cleanvar ldconfig
+# REQUIRE: rpcbind ypset nfsclient FILESYSTEMS ldconfig
# BEFORE: DAEMON
# KEYWORD: nojail shutdown
Modified: head/etc/rc.d/cleanvar
==============================================================================
--- head/etc/rc.d/cleanvar Tue Sep 11 04:54:44 2012 (r240335)
+++ head/etc/rc.d/cleanvar Tue Sep 11 05:04:59 2012 (r240336)
@@ -4,7 +4,7 @@
#
# PROVIDE: cleanvar
-# REQUIRE: FILESYSTEMS var
+# REQUIRE: var
. /etc/rc.subr
Modified: head/etc/rc.d/cron
==============================================================================
--- head/etc/rc.d/cron Tue Sep 11 04:54:44 2012 (r240335)
+++ head/etc/rc.d/cron Tue Sep 11 05:04:59 2012 (r240336)
@@ -4,7 +4,7 @@
#
# PROVIDE: cron
-# REQUIRE: LOGIN cleanvar
+# REQUIRE: LOGIN FILESYSTEMS
# BEFORE: securelevel
# KEYWORD: shutdown
Modified: head/etc/rc.d/dmesg
==============================================================================
--- head/etc/rc.d/dmesg Tue Sep 11 04:54:44 2012 (r240335)
+++ head/etc/rc.d/dmesg Tue Sep 11 05:04:59 2012 (r240336)
@@ -4,7 +4,7 @@
#
# PROVIDE: dmesg
-# REQUIRE: mountcritremote cleanvar
+# REQUIRE: mountcritremote FILESYSTEMS
# BEFORE: DAEMON
# KEYWORD: nojail
Modified: head/etc/rc.d/ftpd
==============================================================================
--- head/etc/rc.d/ftpd Tue Sep 11 04:54:44 2012 (r240335)
+++ head/etc/rc.d/ftpd Tue Sep 11 05:04:59 2012 (r240336)
@@ -4,7 +4,7 @@
#
# PROVIDE: ftpd
-# REQUIRE: LOGIN cleanvar
+# REQUIRE: LOGIN FILESYSTEMS
# KEYWORD: shutdown
. /etc/rc.subr
Modified: head/etc/rc.d/inetd
==============================================================================
--- head/etc/rc.d/inetd Tue Sep 11 04:54:44 2012 (r240335)
+++ head/etc/rc.d/inetd Tue Sep 11 05:04:59 2012 (r240336)
@@ -4,7 +4,7 @@
#
# PROVIDE: inetd
-# REQUIRE: DAEMON LOGIN cleanvar
+# REQUIRE: DAEMON LOGIN FILESYSTEMS
# KEYWORD: shutdown
. /etc/rc.subr
Modified: head/etc/rc.d/ipmon
==============================================================================
--- head/etc/rc.d/ipmon Tue Sep 11 04:54:44 2012 (r240335)
+++ head/etc/rc.d/ipmon Tue Sep 11 05:04:59 2012 (r240336)
@@ -4,7 +4,7 @@
#
# PROVIDE: ipmon
-# REQUIRE: FILESYSTEMS hostname sysctl cleanvar ipfilter
+# REQUIRE: FILESYSTEMS hostname sysctl FILESYSTEMS ipfilter
# BEFORE: SERVERS
# KEYWORD: nojail
Modified: head/etc/rc.d/jail
==============================================================================
--- head/etc/rc.d/jail Tue Sep 11 04:54:44 2012 (r240335)
+++ head/etc/rc.d/jail Tue Sep 11 05:04:59 2012 (r240336)
@@ -4,7 +4,7 @@
#
# PROVIDE: jail
-# REQUIRE: LOGIN cleanvar
+# REQUIRE: LOGIN FILESYSTEMS
# BEFORE: securelevel
# KEYWORD: nojail shutdown
Modified: head/etc/rc.d/ldconfig
==============================================================================
--- head/etc/rc.d/ldconfig Tue Sep 11 04:54:44 2012 (r240335)
+++ head/etc/rc.d/ldconfig Tue Sep 11 05:04:59 2012 (r240336)
@@ -4,7 +4,7 @@
#
# PROVIDE: ldconfig
-# REQUIRE: mountcritremote cleanvar
+# REQUIRE: mountcritremote FILESYSTEMS
# BEFORE: DAEMON
. /etc/rc.subr
Modified: head/etc/rc.d/mixer
==============================================================================
--- head/etc/rc.d/mixer Tue Sep 11 04:54:44 2012 (r240335)
+++ head/etc/rc.d/mixer Tue Sep 11 05:04:59 2012 (r240336)
@@ -28,7 +28,7 @@
#
# PROVIDE: mixer
-# REQUIRE: cleanvar
+# REQUIRE: FILESYSTEMS
# KEYWORD: nojail shutdown
. /etc/rc.subr
Modified: head/etc/rc.d/mountcritremote
==============================================================================
--- head/etc/rc.d/mountcritremote Tue Sep 11 04:54:44 2012 (r240335)
+++ head/etc/rc.d/mountcritremote Tue Sep 11 05:04:59 2012 (r240336)
@@ -4,7 +4,7 @@
#
# PROVIDE: mountcritremote
-# REQUIRE: NETWORKING FILESYSTEMS cleanvar ipsec netwait
+# REQUIRE: NETWORKING FILESYSTEMS ipsec netwait
# KEYWORD: nojail
. /etc/rc.subr
Modified: head/etc/rc.d/moused
==============================================================================
--- head/etc/rc.d/moused Tue Sep 11 04:54:44 2012 (r240335)
+++ head/etc/rc.d/moused Tue Sep 11 05:04:59 2012 (r240336)
@@ -4,7 +4,7 @@
#
# PROVIDE: moused
-# REQUIRE: DAEMON cleanvar
+# REQUIRE: DAEMON FILESYSTEMS
# KEYWORD: nojail shutdown
. /etc/rc.subr
Modified: head/etc/rc.d/mrouted
==============================================================================
--- head/etc/rc.d/mrouted Tue Sep 11 04:54:44 2012 (r240335)
+++ head/etc/rc.d/mrouted Tue Sep 11 05:04:59 2012 (r240336)
@@ -4,7 +4,7 @@
#
# PROVIDE: mrouted
-# REQUIRE: netif routing cleanvar
+# REQUIRE: netif routing FILESYSTEMS
# KEYWORD: nojail
. /etc/rc.subr
Modified: head/etc/rc.d/named
==============================================================================
--- head/etc/rc.d/named Tue Sep 11 04:54:44 2012 (r240335)
+++ head/etc/rc.d/named Tue Sep 11 05:04:59 2012 (r240336)
@@ -4,7 +4,7 @@
#
# PROVIDE: named
-# REQUIRE: SERVERS cleanvar
+# REQUIRE: SERVERS FILESYSTEMS
# KEYWORD: shutdown
. /etc/rc.subr
Modified: head/etc/rc.d/netif
==============================================================================
--- head/etc/rc.d/netif Tue Sep 11 04:54:44 2012 (r240335)
+++ head/etc/rc.d/netif Tue Sep 11 05:04:59 2012 (r240336)
@@ -26,7 +26,7 @@
#
# PROVIDE: netif
-# REQUIRE: atm1 cleanvar FILESYSTEMS serial sppp sysctl
+# REQUIRE: atm1 FILESYSTEMS serial sppp sysctl
# REQUIRE: ipfilter ipfs
# KEYWORD: nojail
Modified: head/etc/rc.d/newsyslog
==============================================================================
--- head/etc/rc.d/newsyslog Tue Sep 11 04:54:44 2012 (r240335)
+++ head/etc/rc.d/newsyslog Tue Sep 11 05:04:59 2012 (r240336)
@@ -4,7 +4,7 @@
#
# PROVIDE: newsyslog
-# REQUIRE: cleanvar mountcritremote
+# REQUIRE: FILESYSTEMS mountcritremote
. /etc/rc.subr
Modified: head/etc/rc.d/ntpd
==============================================================================
--- head/etc/rc.d/ntpd Tue Sep 11 04:54:44 2012 (r240335)
+++ head/etc/rc.d/ntpd Tue Sep 11 05:04:59 2012 (r240336)
@@ -4,7 +4,7 @@
#
# PROVIDE: ntpd
-# REQUIRE: DAEMON ntpdate cleanvar devfs
+# REQUIRE: DAEMON ntpdate FILESYSTEMS devfs
# BEFORE: LOGIN
# KEYWORD: nojail shutdown
Modified: head/etc/rc.d/pflog
==============================================================================
--- head/etc/rc.d/pflog Tue Sep 11 04:54:44 2012 (r240335)
+++ head/etc/rc.d/pflog Tue Sep 11 05:04:59 2012 (r240336)
@@ -4,7 +4,7 @@
#
# PROVIDE: pflog
-# REQUIRE: FILESYSTEMS netif cleanvar
+# REQUIRE: FILESYSTEMS netif FILESYSTEMS
# KEYWORD: nojail
. /etc/rc.subr
Modified: head/etc/rc.d/postrandom
==============================================================================
--- head/etc/rc.d/postrandom Tue Sep 11 04:54:44 2012 (r240335)
+++ head/etc/rc.d/postrandom Tue Sep 11 05:04:59 2012 (r240336)
@@ -4,7 +4,7 @@
#
# PROVIDE: postrandom
-# REQUIRE: initrandom random var
+# REQUIRE: initrandom random FILESYSTEMS
# BEFORE: LOGIN
# KEYWORD: nojail
Modified: head/etc/rc.d/random
==============================================================================
--- head/etc/rc.d/random Tue Sep 11 04:54:44 2012 (r240335)
+++ head/etc/rc.d/random Tue Sep 11 05:04:59 2012 (r240336)
@@ -4,7 +4,7 @@
#
# PROVIDE: random
-# REQUIRE: initrandom var
+# REQUIRE: initrandom FILESYSTEMS
# BEFORE: netif
# KEYWORD: nojail shutdown
Modified: head/etc/rc.d/rarpd
==============================================================================
--- head/etc/rc.d/rarpd Tue Sep 11 04:54:44 2012 (r240335)
+++ head/etc/rc.d/rarpd Tue Sep 11 05:04:59 2012 (r240336)
@@ -4,7 +4,7 @@
#
# PROVIDE: rarpd
-# REQUIRE: DAEMON cleanvar
+# REQUIRE: DAEMON FILESYSTEMS
# BEFORE: LOGIN
# KEYWORD: nojail
Modified: head/etc/rc.d/resolv
==============================================================================
--- head/etc/rc.d/resolv Tue Sep 11 04:54:44 2012 (r240335)
+++ head/etc/rc.d/resolv Tue Sep 11 05:04:59 2012 (r240336)
@@ -28,7 +28,7 @@
#
# PROVIDE: resolv
-# REQUIRE: netif var
+# REQUIRE: netif FILESYSTEMS
# KEYWORD: nojail
. /etc/rc.subr
Modified: head/etc/rc.d/sendmail
==============================================================================
--- head/etc/rc.d/sendmail Tue Sep 11 04:54:44 2012 (r240335)
+++ head/etc/rc.d/sendmail Tue Sep 11 05:04:59 2012 (r240336)
@@ -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
Modified: head/etc/rc.d/sshd
==============================================================================
--- head/etc/rc.d/sshd Tue Sep 11 04:54:44 2012 (r240335)
+++ head/etc/rc.d/sshd Tue Sep 11 05:04:59 2012 (r240336)
@@ -4,7 +4,7 @@
#
# PROVIDE: sshd
-# REQUIRE: LOGIN cleanvar
+# REQUIRE: LOGIN FILESYSTEMS
# KEYWORD: shutdown
. /etc/rc.subr
Modified: head/etc/rc.d/syslogd
==============================================================================
--- head/etc/rc.d/syslogd Tue Sep 11 04:54:44 2012 (r240335)
+++ head/etc/rc.d/syslogd Tue Sep 11 05:04:59 2012 (r240336)
@@ -4,7 +4,7 @@
#
# PROVIDE: syslogd
-# REQUIRE: mountcritremote cleanvar newsyslog
+# REQUIRE: mountcritremote FILESYSTEMS newsyslog
# BEFORE: SERVERS
. /etc/rc.subr
Modified: head/etc/rc.d/utx
==============================================================================
--- head/etc/rc.d/utx Tue Sep 11 04:54:44 2012 (r240335)
+++ head/etc/rc.d/utx Tue Sep 11 05:04:59 2012 (r240336)
@@ -4,7 +4,7 @@
#
# PROVIDE: utx
-# REQUIRE: DAEMON cleanvar
+# REQUIRE: DAEMON FILESYSTEMS
# KEYWORD: shutdown
. /etc/rc.subr
Modified: head/etc/rc.d/var
==============================================================================
--- head/etc/rc.d/var Tue Sep 11 04:54:44 2012 (r240335)
+++ head/etc/rc.d/var Tue Sep 11 05:04:59 2012 (r240336)
@@ -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
Modified: head/etc/rc.d/watchdogd
==============================================================================
--- head/etc/rc.d/watchdogd Tue Sep 11 04:54:44 2012 (r240335)
+++ head/etc/rc.d/watchdogd Tue Sep 11 05:04:59 2012 (r240336)
@@ -28,7 +28,7 @@
#
# PROVIDE: watchdogd
-# REQUIRE: FILESYSTEMS cleanvar syslogd
+# REQUIRE: FILESYSTEMS syslogd
# KEYWORD: nojail shutdown
. /etc/rc.subr
More information about the svn-src-head
mailing list