Author: dougb
Date: Fri Feb 10 10:18:30 2012
New Revision: 231372
URL: http://svn.freebsd.org/changeset/base/231372
Log:
MFC r208307:
This change does the following for the scripts that run up through
FILESYSTEMS (the default early_late_divider):
1. Move sysctl to run first
2. Move as many BEFOREs to REQUIREs as possible.
3. Minor effect, move hostid_save from right before mdconfig to right
after.
A lot of the early scripts make use of sysctl one way or another so
running this first makes a lot of sense given that system-critical
values are often placed in sysctl.conf. (More details in original log.)
In addition to the changes from this revision, tweak a few other rcorder
elements in order to minimize the differences between the order before
and after this change, mostly related to scripts still in this branch
that are no longer in HEAD.
Modified:
stable/8/etc/rc.d/SERVERS
stable/8/etc/rc.d/addswap
stable/8/etc/rc.d/auto_linklocal
stable/8/etc/rc.d/cleanvar
stable/8/etc/rc.d/ddb
stable/8/etc/rc.d/dumpon
stable/8/etc/rc.d/hostid
stable/8/etc/rc.d/hostid_save
stable/8/etc/rc.d/initrandom
stable/8/etc/rc.d/mdconfig
stable/8/etc/rc.d/mountcritlocal
stable/8/etc/rc.d/netif
stable/8/etc/rc.d/savecore
stable/8/etc/rc.d/sysctl
stable/8/etc/rc.d/zvol
Directory Properties:
stable/8/etc/ (props changed)
Modified: stable/8/etc/rc.d/SERVERS
==============================================================================
--- stable/8/etc/rc.d/SERVERS Fri Feb 10 10:10:41 2012 (r231371)
+++ stable/8/etc/rc.d/SERVERS Fri Feb 10 10:18:30 2012 (r231372)
@@ -4,7 +4,7 @@
#
# PROVIDE: SERVERS
-# REQUIRE: mountcritremote abi ldconfig
+# REQUIRE: mountcritremote abi ldconfig savecore
# This is a dummy dependency, for early-start servers relying on
# some basic configuration.
Modified: stable/8/etc/rc.d/addswap
==============================================================================
--- stable/8/etc/rc.d/addswap Fri Feb 10 10:10:41 2012 (r231371)
+++ stable/8/etc/rc.d/addswap Fri Feb 10 10:18:30 2012 (r231372)
@@ -7,7 +7,6 @@
# PROVIDE: addswap
# REQUIRE: FILESYSTEMS
-# BEFORE: sysctl
# KEYWORD: nojail
. /etc/rc.subr
Modified: stable/8/etc/rc.d/auto_linklocal
==============================================================================
--- stable/8/etc/rc.d/auto_linklocal Fri Feb 10 10:10:41 2012
(r231371)
+++ stable/8/etc/rc.d/auto_linklocal Fri Feb 10 10:18:30 2012
(r231372)
@@ -5,7 +5,6 @@
# PROVIDE: auto_linklocal
# REQUIRE: root
-# BEFORE: sysctl
# KEYWORD: nojail
. /etc/rc.subr
Modified: stable/8/etc/rc.d/cleanvar
==============================================================================
--- stable/8/etc/rc.d/cleanvar Fri Feb 10 10:10:41 2012 (r231371)
+++ stable/8/etc/rc.d/cleanvar Fri Feb 10 10:18:30 2012 (r231372)
@@ -4,7 +4,7 @@
#
# PROVIDE: cleanvar
-# REQUIRE: FILESYSTEMS var
+# REQUIRE: FILESYSTEMS var addswap
. /etc/rc.subr
Modified: stable/8/etc/rc.d/ddb
==============================================================================
--- stable/8/etc/rc.d/ddb Fri Feb 10 10:10:41 2012 (r231371)
+++ stable/8/etc/rc.d/ddb Fri Feb 10 10:18:30 2012 (r231372)
@@ -5,7 +5,7 @@
# PROVIDE: ddb
# REQUIRE: dumpon
-# BEFORE: disks savecore initrandom
+# BEFORE: disks
# KEYWORD: nojail
. /etc/rc.subr
Modified: stable/8/etc/rc.d/dumpon
==============================================================================
--- stable/8/etc/rc.d/dumpon Fri Feb 10 10:10:41 2012 (r231371)
+++ stable/8/etc/rc.d/dumpon Fri Feb 10 10:18:30 2012 (r231372)
@@ -4,7 +4,8 @@
#
# PROVIDE: dumpon
-# BEFORE: disks savecore initrandom
+# REQUIRE: zvol
+# BEFORE: disks
# KEYWORD: nojail
. /etc/rc.subr
Modified: stable/8/etc/rc.d/hostid
==============================================================================
--- stable/8/etc/rc.d/hostid Fri Feb 10 10:10:41 2012 (r231371)
+++ stable/8/etc/rc.d/hostid Fri Feb 10 10:18:30 2012 (r231372)
@@ -28,7 +28,7 @@
#
# PROVIDE: hostid
-# BEFORE: fsck
+# REQUIRE: sysctl
# KEYWORD: nojail
. /etc/rc.subr
Modified: stable/8/etc/rc.d/hostid_save
==============================================================================
--- stable/8/etc/rc.d/hostid_save Fri Feb 10 10:10:41 2012
(r231371)
+++ stable/8/etc/rc.d/hostid_save Fri Feb 10 10:18:30 2012
(r231372)
@@ -5,7 +5,6 @@
# PROVIDE: hostid_save
# REQUIRE: root
-# BEFORE: mountcritlocal
# KEYWORD: nojail
. /etc/rc.subr
Modified: stable/8/etc/rc.d/initrandom
==============================================================================
--- stable/8/etc/rc.d/initrandom Fri Feb 10 10:10:41 2012
(r231371)
+++ stable/8/etc/rc.d/initrandom Fri Feb 10 10:18:30 2012
(r231372)
@@ -4,6 +4,7 @@
#
# PROVIDE: initrandom
+# REQUIRE: dumpon ddb
# BEFORE: disks
# KEYWORD: nojail
Modified: stable/8/etc/rc.d/mdconfig
==============================================================================
--- stable/8/etc/rc.d/mdconfig Fri Feb 10 10:10:41 2012 (r231371)
+++ stable/8/etc/rc.d/mdconfig Fri Feb 10 10:18:30 2012 (r231372)
@@ -28,8 +28,7 @@
#
# PROVIDE: mdconfig
-# REQUIRE: localswap
-# BEFORE: mountcritlocal
+# REQUIRE: localswap root
. /etc/rc.subr
Modified: stable/8/etc/rc.d/mountcritlocal
==============================================================================
--- stable/8/etc/rc.d/mountcritlocal Fri Feb 10 10:10:41 2012
(r231371)
+++ stable/8/etc/rc.d/mountcritlocal Fri Feb 10 10:18:30 2012
(r231372)
@@ -4,7 +4,7 @@
#
# PROVIDE: mountcritlocal
-# REQUIRE: root
+# REQUIRE: root hostid_save mdconfig
# KEYWORD: nojail shutdown
. /etc/rc.subr
Modified: stable/8/etc/rc.d/netif
==============================================================================
--- stable/8/etc/rc.d/netif Fri Feb 10 10:10:41 2012 (r231371)
+++ stable/8/etc/rc.d/netif Fri Feb 10 10:18:30 2012 (r231372)
@@ -27,7 +27,7 @@
# PROVIDE: netif
# REQUIRE: atm1 cleanvar FILESYSTEMS serial sppp sysctl
-# REQUIRE: ipfilter ipfs
+# REQUIRE: ipfilter ipfs auto_linklocal
# KEYWORD: nojail
. /etc/rc.subr
Modified: stable/8/etc/rc.d/savecore
==============================================================================
--- stable/8/etc/rc.d/savecore Fri Feb 10 10:10:41 2012 (r231371)
+++ stable/8/etc/rc.d/savecore Fri Feb 10 10:18:30 2012 (r231372)
@@ -4,8 +4,7 @@
#
# PROVIDE: savecore
-# REQUIRE: syslogd
-# BEFORE: SERVERS
+# REQUIRE: dumpon ddb syslogd
# KEYWORD: nojail
. /etc/rc.subr
Modified: stable/8/etc/rc.d/sysctl
==============================================================================
--- stable/8/etc/rc.d/sysctl Fri Feb 10 10:10:41 2012 (r231371)
+++ stable/8/etc/rc.d/sysctl Fri Feb 10 10:18:30 2012 (r231372)
@@ -4,8 +4,6 @@
#
# PROVIDE: sysctl
-# REQUIRE: root
-# BEFORE: DAEMON
. /etc/rc.subr
Modified: stable/8/etc/rc.d/zvol
==============================================================================
--- stable/8/etc/rc.d/zvol Fri Feb 10 10:10:41 2012 (r231371)
+++ stable/8/etc/rc.d/zvol Fri Feb 10 10:18:30 2012 (r231372)
@@ -5,7 +5,6 @@
# PROVIDE: zvol
# REQUIRE: hostid
-# BEFORE: fsck
# KEYWORD: nojail
. /etc/rc.subr
_______________________________________________
svn-src-all@freebsd.org mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"
