diff options
author | 2006-09-25 07:47:44 +0000 | |
---|---|---|
committer | 2006-09-25 07:47:44 +0000 | |
commit | c5306b99fb5349a9b0cee29523d437f0fdcc1d98 (patch) | |
tree | 9abdc934131964213c580915177e3e1d1b4fa69e | |
parent | Merging r2242. (diff) | |
download | baselayout-vserver-c5306b99fb5349a9b0cee29523d437f0fdcc1d98.tar.gz baselayout-vserver-c5306b99fb5349a9b0cee29523d437f0fdcc1d98.tar.bz2 baselayout-vserver-c5306b99fb5349a9b0cee29523d437f0fdcc1d98.zip |
Merging r2267.
svn path=/baselayout-vserver/branches/baselayout-1_12/; revision=487
-rw-r--r-- | ChangeLog | 4 | ||||
-rw-r--r-- | etc/conf.d/rc | 4 | ||||
-rwxr-xr-x | sbin/rc | 9 | ||||
-rwxr-xr-x | sbin/runscript.sh | 2 |
4 files changed, 12 insertions, 7 deletions
@@ -1,6 +1,10 @@ # ChangeLog for Gentoo System Intialization ("rc") scripts # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPLv2 + 19 Sep 2006; Roy Marples <uberlord@gentoo.org>: + + Start scheduled services in the correct order, #148011. + 06 Sep 2006; Roy Marples <uberlord@gentoo.org>: Fix PPPoA usage, #144194 thanks to Giampaolo Tomassoni. diff --git a/etc/conf.d/rc b/etc/conf.d/rc index af99bb0..283d3f0 100644 --- a/etc/conf.d/rc +++ b/etc/conf.d/rc @@ -71,7 +71,7 @@ RC_VERBOSE="no" RC_BOOTLOG="no" # Set to "yes" if you want to benchmark system boot with bootchart. -# You'll need to emerge the app-benchmark/bootchart package for this to work. +# You'll need to emerge the app-benchmarks/bootchart package for this to work. RC_BOOTCHART="no" @@ -107,7 +107,7 @@ RC_FORCE_AUTO="no" # RC_DMESG_LEVEL sets the level at which logging of messages is done to the # console. See dmesg(8) for more info. -RC_DMESG_LOGLEVEL="1" +RC_DMESG_LEVEL="1" @@ -272,9 +272,9 @@ then esac # Check udev prerequisites and kernel params - if [ "${udev}" = "yes" ] && has_addon udev + if [ "${udev}" = "yes" ] then - if get_bootparam "noudev" || \ + if get_bootparam "noudev" || ! has_addon udev-start.sh || \ [ ${devfs_automounted} = "yes" ] || \ [ "$(get_KV)" -lt "$(KV_to_int '2.6.0')" ] then @@ -283,9 +283,10 @@ then fi # Check devfs prerequisites and kernel params - if [ "${devfs}" = "yes" ] && has_addon devfs + if [ "${devfs}" = "yes" ] then - if get_bootparam "nodevfs" || [ "${udev}" = "yes" ] + if get_bootparam "nodevfs" || [ "${udev}" = "yes" ] || \ + ! has_addon devfs-start.sh then devfs="no" fi diff --git a/sbin/runscript.sh b/sbin/runscript.sh index 99feca7..0fdac7e 100755 --- a/sbin/runscript.sh +++ b/sbin/runscript.sh @@ -158,7 +158,7 @@ svc_start_scheduled() { services="${services} ${x##*/}" done - for x in ${services} ; do + for x in $(trace_dependencies ${services}) ; do service_stopped "${x}" && start_service "${x}" rm -f "${svcdir}/scheduled/${SVCNAME}/${x}" done |