diff options
| author |   Christian Heim <phreak@gentoo.org> | 2006-07-13 07:55:52 +0000 |
|---|---|---|
| committer | Christian Heim <phreak@gentoo.org> | 2006-07-13 07:55:52 +0000 |
| commit | be71ee01e2e1bd165409fa68058daca280ba4289 (patch) | |
| tree | 62fc4620d1080744c62032788907e5a4aee6005b | |
| parent | Merging r2145 from upstream baselayout (diff) | |
| download | baselayout-vserver-be71ee01e2e1bd165409fa68058daca280ba4289.tar.gz baselayout-vserver-be71ee01e2e1bd165409fa68058daca280ba4289.tar.bz2 baselayout-vserver-be71ee01e2e1bd165409fa68058daca280ba4289.zip | |
Merging r2151
svn path=/baselayout-vserver/branches/baselayout-1_12/; revision=401
| -rw-r--r-- | ChangeLog | 7 | ||||
| -rwxr-xr-x | sbin/rc | 2 | ||||
| -rwxr-xr-x | sbin/runscript.sh | 2 |
3 files changed, 9 insertions, 2 deletions
@@ -1,6 +1,13 @@ # ChangeLog for Gentoo System Intialization ("rc") scripts # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPLv2 + 12 Jul 2006; Roy Marples <uberlord@gentoo.org>: + + Add bootmisc as a CRITICAL_SERVICE as too many init scripts don't + depend on it, which means that /var/run and others could get cleaned after + daemons write important things there - like pidfiles - when using parallel + startup. + 10 Jul 2006; Roy Marples <uberlord@gentoo.org>: Fixed some internal net dependencies with >1 active net service @@ -148,7 +148,7 @@ get_critical_services() { CRITICAL_SERVICES="${CRITICAL_SERVICES} ${x##*/}" done else - CRITICAL_SERVICES="checkroot modules checkfs localmount clock" + CRITICAL_SERVICES="checkroot modules checkfs localmount clock bootmisc" fi export CRITICAL_SERVICES diff --git a/sbin/runscript.sh b/sbin/runscript.sh index e9b5388..e8fa562 100755 --- a/sbin/runscript.sh +++ b/sbin/runscript.sh @@ -196,7 +196,7 @@ svc_stop() { if [[ ${svcpause} != "yes" && ${RC_NO_DEPS} != "yes" ]] ; then if net_service "${SVCNAME}" ; then - if is_runlevel_stop || is_net_up "${SVCNAME}" ; then + if is_runlevel_stop || ! is_net_up "${SVCNAME}" ; then mydeps="net" fi fi |