summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordougb <dougb@FreeBSD.org>2010-05-19 19:03:19 +0000
committerdougb <dougb@FreeBSD.org>2010-05-19 19:03:19 +0000
commitc3df0e88540d6dd2e20e52609e8e75c55790bb4a (patch)
treeefb149b788cac34dc1540f92fb4e52890258fe73
parent25e31d8ac6d6785593c820b06c5b756f9175b7d9 (diff)
downloadFreeBSD-src-c3df0e88540d6dd2e20e52609e8e75c55790bb4a.zip
FreeBSD-src-c3df0e88540d6dd2e20e52609e8e75c55790bb4a.tar.gz
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. My original purpose for working on this was that while doing some debugging on other stuff I noticed that the order of execution was different in the first pass through the early scripts and the second. In practice that doesn't matter because the scripts are not executed the second time. However this _can_ result in problems if the difference in the rcorder moves a script from the late section to the early section in the second pass (which would mean the script would not get executed). So, I wanted to make the order of execution of the scripts in the early section more deterministic. In the course of debugging the ordering problems I noticed that moving the BEFOREs to REQUIREs prevented the changes in order from the first pass to the second pass without having to make any substantial changes. (Of course it's no secret that I think BEFORE should be avoided as much as possible, but this is a good example of why.) Reviewed by: silence on freebsd-rc@ MFC after: 8.1-RELEASE
-rwxr-xr-xetc/rc.d/SERVERS2
-rwxr-xr-xetc/rc.d/ddb2
-rwxr-xr-xetc/rc.d/dumpon3
-rwxr-xr-xetc/rc.d/hostid2
-rwxr-xr-xetc/rc.d/hostid_save1
-rwxr-xr-xetc/rc.d/initrandom1
-rwxr-xr-xetc/rc.d/mdconfig3
-rwxr-xr-xetc/rc.d/mountcritlocal2
-rwxr-xr-xetc/rc.d/savecore3
-rwxr-xr-xetc/rc.d/sysctl2
-rwxr-xr-xetc/rc.d/zvol1
11 files changed, 9 insertions, 13 deletions
diff --git a/etc/rc.d/SERVERS b/etc/rc.d/SERVERS
index 01e51a8..3398487 100755
--- a/etc/rc.d/SERVERS
+++ b/etc/rc.d/SERVERS
@@ -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.
diff --git a/etc/rc.d/ddb b/etc/rc.d/ddb
index f4d34b1..51e24ea 100755
--- a/etc/rc.d/ddb
+++ b/etc/rc.d/ddb
@@ -5,7 +5,7 @@
# PROVIDE: ddb
# REQUIRE: dumpon
-# BEFORE: disks savecore initrandom
+# BEFORE: disks
# KEYWORD: nojail
. /etc/rc.subr
diff --git a/etc/rc.d/dumpon b/etc/rc.d/dumpon
index 4e448ea..ce5fc1c 100755
--- a/etc/rc.d/dumpon
+++ b/etc/rc.d/dumpon
@@ -4,7 +4,8 @@
#
# PROVIDE: dumpon
-# BEFORE: disks savecore initrandom
+# REQUIRE: zvol
+# BEFORE: disks
# KEYWORD: nojail
. /etc/rc.subr
diff --git a/etc/rc.d/hostid b/etc/rc.d/hostid
index 45d679b..20f8502 100755
--- a/etc/rc.d/hostid
+++ b/etc/rc.d/hostid
@@ -28,7 +28,7 @@
#
# PROVIDE: hostid
-# BEFORE: fsck
+# REQUIRE: sysctl
# KEYWORD: nojail
. /etc/rc.subr
diff --git a/etc/rc.d/hostid_save b/etc/rc.d/hostid_save
index 44e403f..fca0521 100755
--- a/etc/rc.d/hostid_save
+++ b/etc/rc.d/hostid_save
@@ -5,7 +5,6 @@
# PROVIDE: hostid_save
# REQUIRE: root
-# BEFORE: mountcritlocal
# KEYWORD: nojail
. /etc/rc.subr
diff --git a/etc/rc.d/initrandom b/etc/rc.d/initrandom
index 8802396..c42490e 100755
--- a/etc/rc.d/initrandom
+++ b/etc/rc.d/initrandom
@@ -4,6 +4,7 @@
#
# PROVIDE: initrandom
+# REQUIRE: dumpon ddb
# BEFORE: disks
# KEYWORD: nojail
diff --git a/etc/rc.d/mdconfig b/etc/rc.d/mdconfig
index 093c402..c697c35 100755
--- a/etc/rc.d/mdconfig
+++ b/etc/rc.d/mdconfig
@@ -28,8 +28,7 @@
#
# PROVIDE: mdconfig
-# REQUIRE: localswap
-# BEFORE: mountcritlocal
+# REQUIRE: localswap root
. /etc/rc.subr
diff --git a/etc/rc.d/mountcritlocal b/etc/rc.d/mountcritlocal
index 7892517..acd269e 100755
--- a/etc/rc.d/mountcritlocal
+++ b/etc/rc.d/mountcritlocal
@@ -4,7 +4,7 @@
#
# PROVIDE: mountcritlocal
-# REQUIRE: root
+# REQUIRE: root hostid_save mdconfig
# KEYWORD: nojail
. /etc/rc.subr
diff --git a/etc/rc.d/savecore b/etc/rc.d/savecore
index 2bee021..4efb7db 100755
--- a/etc/rc.d/savecore
+++ b/etc/rc.d/savecore
@@ -4,8 +4,7 @@
#
# PROVIDE: savecore
-# REQUIRE: syslogd
-# BEFORE: SERVERS
+# REQUIRE: dumpon ddb syslogd
# KEYWORD: nojail
. /etc/rc.subr
diff --git a/etc/rc.d/sysctl b/etc/rc.d/sysctl
index 1bc92ae..34fb3b5 100755
--- a/etc/rc.d/sysctl
+++ b/etc/rc.d/sysctl
@@ -4,8 +4,6 @@
#
# PROVIDE: sysctl
-# REQUIRE: root
-# BEFORE: FILESYSTEMS
. /etc/rc.subr
diff --git a/etc/rc.d/zvol b/etc/rc.d/zvol
index 3179d42..62c9015 100755
--- a/etc/rc.d/zvol
+++ b/etc/rc.d/zvol
@@ -5,7 +5,6 @@
# PROVIDE: zvol
# REQUIRE: hostid
-# BEFORE: fsck
# KEYWORD: nojail
. /etc/rc.subr
OpenPOWER on IntegriCloud