Skip to content
Browse files

Fix a bad merge with /etc/rc and the first startup changes

  • Loading branch information...
1 parent 64f96ec commit a1bcb1ea8387d8d8c1f87582e1beea83c533368d @kmoore134 kmoore134 committed
Showing with 11 additions and 14 deletions.
  1. +11 −14 etc/rc
View
25 etc/rc
@@ -159,26 +159,23 @@ else
#
case ${local_startup} in
- [Nn][Oo] | '') ;;
- *) find_local_scripts_new ;;
+ [Nn][Oo] | '') ;;
+ *) find_local_scripts_new ;;
esac
- files=`rcorder ${skip} /etc/rc.d/* ${local_rc} 2>/dev/null`
+ files=`rcorder ${skip} ${skip_firstboot} /etc/rc.d/* ${local_rc} 2>/dev/null`
for _rc_elem in ${files}; do
- # The firstboot sentinel might be on a newly mounted filesystem; look for it
- # again and unset skip_firstboot if we find it.
- if [ -e ${firstboot_sentinel} ]; then
+ # The firstboot sentinel might be on a newly mounted filesystem; look for it
+ # again and unset skip_firstboot if we find it.
+ if [ -e ${firstboot_sentinel} ]; then
skip_firstboot=""
- fi
-
- files=`rcorder ${skip} ${skip_firstboot} /etc/rc.d/* ${local_rc} 2>/dev/null`
- for _rc_elem in ${files}; do
- case "$_rc_elem_done" in
- *" $_rc_elem "*) continue ;;
- esac
+ fi
- run_rc_script ${_rc_elem} ${_boot}
+ case "$_rc_elem_done" in
+ *" $_rc_elem "*) continue ;;
+ esac
+ run_rc_script ${_rc_elem} ${_boot}
done
fi

0 comments on commit a1bcb1e

Please sign in to comment.
Something went wrong with that request. Please try again.