Date: Wed, 19 May 2010 19:03:20 +0000 (UTC) From: Doug Barton <dougb@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r208307 - head/etc/rc.d Message-ID: <201005191903.o4JJ3KCO060309@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: dougb Date: Wed May 19 19:03:19 2010 New Revision: 208307 URL: http://svn.freebsd.org/changeset/base/208307 Log: 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 Modified: head/etc/rc.d/SERVERS head/etc/rc.d/ddb head/etc/rc.d/dumpon head/etc/rc.d/hostid head/etc/rc.d/hostid_save head/etc/rc.d/initrandom head/etc/rc.d/mdconfig head/etc/rc.d/mountcritlocal head/etc/rc.d/savecore head/etc/rc.d/sysctl head/etc/rc.d/zvol Modified: head/etc/rc.d/SERVERS ============================================================================== --- head/etc/rc.d/SERVERS Wed May 19 17:31:36 2010 (r208306) +++ head/etc/rc.d/SERVERS Wed May 19 19:03:19 2010 (r208307) @@ -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: head/etc/rc.d/ddb ============================================================================== --- head/etc/rc.d/ddb Wed May 19 17:31:36 2010 (r208306) +++ head/etc/rc.d/ddb Wed May 19 19:03:19 2010 (r208307) @@ -5,7 +5,7 @@ # PROVIDE: ddb # REQUIRE: dumpon -# BEFORE: disks savecore initrandom +# BEFORE: disks # KEYWORD: nojail . /etc/rc.subr Modified: head/etc/rc.d/dumpon ============================================================================== --- head/etc/rc.d/dumpon Wed May 19 17:31:36 2010 (r208306) +++ head/etc/rc.d/dumpon Wed May 19 19:03:19 2010 (r208307) @@ -4,7 +4,8 @@ # # PROVIDE: dumpon -# BEFORE: disks savecore initrandom +# REQUIRE: zvol +# BEFORE: disks # KEYWORD: nojail . /etc/rc.subr Modified: head/etc/rc.d/hostid ============================================================================== --- head/etc/rc.d/hostid Wed May 19 17:31:36 2010 (r208306) +++ head/etc/rc.d/hostid Wed May 19 19:03:19 2010 (r208307) @@ -28,7 +28,7 @@ # # PROVIDE: hostid -# BEFORE: fsck +# REQUIRE: sysctl # KEYWORD: nojail . /etc/rc.subr Modified: head/etc/rc.d/hostid_save ============================================================================== --- head/etc/rc.d/hostid_save Wed May 19 17:31:36 2010 (r208306) +++ head/etc/rc.d/hostid_save Wed May 19 19:03:19 2010 (r208307) @@ -5,7 +5,6 @@ # PROVIDE: hostid_save # REQUIRE: root -# BEFORE: mountcritlocal # KEYWORD: nojail . /etc/rc.subr Modified: head/etc/rc.d/initrandom ============================================================================== --- head/etc/rc.d/initrandom Wed May 19 17:31:36 2010 (r208306) +++ head/etc/rc.d/initrandom Wed May 19 19:03:19 2010 (r208307) @@ -4,6 +4,7 @@ # # PROVIDE: initrandom +# REQUIRE: dumpon ddb # BEFORE: disks # KEYWORD: nojail Modified: head/etc/rc.d/mdconfig ============================================================================== --- head/etc/rc.d/mdconfig Wed May 19 17:31:36 2010 (r208306) +++ head/etc/rc.d/mdconfig Wed May 19 19:03:19 2010 (r208307) @@ -28,8 +28,7 @@ # # PROVIDE: mdconfig -# REQUIRE: localswap -# BEFORE: mountcritlocal +# REQUIRE: localswap root . /etc/rc.subr Modified: head/etc/rc.d/mountcritlocal ============================================================================== --- head/etc/rc.d/mountcritlocal Wed May 19 17:31:36 2010 (r208306) +++ head/etc/rc.d/mountcritlocal Wed May 19 19:03:19 2010 (r208307) @@ -4,7 +4,7 @@ # # PROVIDE: mountcritlocal -# REQUIRE: root +# REQUIRE: root hostid_save mdconfig # KEYWORD: nojail . /etc/rc.subr Modified: head/etc/rc.d/savecore ============================================================================== --- head/etc/rc.d/savecore Wed May 19 17:31:36 2010 (r208306) +++ head/etc/rc.d/savecore Wed May 19 19:03:19 2010 (r208307) @@ -4,8 +4,7 @@ # # PROVIDE: savecore -# REQUIRE: syslogd -# BEFORE: SERVERS +# REQUIRE: dumpon ddb syslogd # KEYWORD: nojail . /etc/rc.subr Modified: head/etc/rc.d/sysctl ============================================================================== --- head/etc/rc.d/sysctl Wed May 19 17:31:36 2010 (r208306) +++ head/etc/rc.d/sysctl Wed May 19 19:03:19 2010 (r208307) @@ -4,8 +4,6 @@ # # PROVIDE: sysctl -# REQUIRE: root -# BEFORE: FILESYSTEMS . /etc/rc.subr Modified: head/etc/rc.d/zvol ============================================================================== --- head/etc/rc.d/zvol Wed May 19 17:31:36 2010 (r208306) +++ head/etc/rc.d/zvol Wed May 19 19:03:19 2010 (r208307) @@ -5,7 +5,6 @@ # PROVIDE: zvol # REQUIRE: hostid -# BEFORE: fsck # KEYWORD: nojail . /etc/rc.subr
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201005191903.o4JJ3KCO060309>