Author: dougb
Date: Sat May 14 21:34:21 2011
New Revision: 221928
URL: http://svn.freebsd.org/changeset/base/221928
Log:
MFC r221227:
Keep a list of the scripts run before early_late_divider, and use that list
to skip things in the second run.
Modified:
stable/7/etc/rc
Directory Properties:
stable/7/etc/ (props changed)
Modified: stable/7/etc/rc
==============================================================================
--- stable/7/etc/rc Sat May 14 21:31:18 2011 (r221927)
+++ stable/7/etc/rc Sat May 14 21:34:21 2011 (r221928)
@@ -85,8 +85,10 @@ fi
#
files=`rcorder ${skip} /etc/rc.d/* 2>/dev/null`
+_rc_elem_done=' '
for _rc_elem in ${files}; do
run_rc_script ${_rc_elem} ${_boot}
+ _rc_elem_done="${_rc_elem_done}${_rc_elem} "
case "$_rc_elem" in
*/${early_late_divider}) break ;;
@@ -104,14 +106,9 @@ case ${local_startup} in
esac
files=`rcorder ${skip} /etc/rc.d/* ${local_rc} 2>/dev/null`
-_skip_early=1
for _rc_elem in ${files}; do
- case "$_skip_early" in
- 1) case "$_rc_elem" in
- */${early_late_divider}) _skip_early=0 ;;
- esac
- continue
- ;;
+ case "$_rc_elem_done" in
+ *" $_rc_elem "*) continue ;;
esac
run_rc_script ${_rc_elem} ${_boot}
_______________________________________________
[email protected] mailing list
http://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "[email protected]"
