emo/openrc
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Don't wait for services that were inactive, #183667 thanks to Daniel Drake

Browse Source
This commit is contained in:
Roy Marples 2007-07-02 22:07:58 +00:00
parent 3a9375c7df
commit f23b6d0e95
2 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
ChangeLog
View File

@ -1,6 +1,10 @@
# ChangeLog for Gentoo System Intialization ("rc") scripts # ChangeLog for Gentoo System Intialization ("rc") scripts
# Copyright 1999-2007 Gentoo Foundation; Distributed under the GPLv2 # Copyright 1999-2007 Gentoo Foundation; Distributed under the GPLv2
02 Jul 2007; Roy Marples <uberlord@gentoo.org>:
Don't wait for services that were inactive, #183667 thanks to Daniel Drake
30 Jun 2007; Roy Marples <uberlord@gentoo.org>: 30 Jun 2007; Roy Marples <uberlord@gentoo.org>:
Don't set an early font if consolefont isn't in a runlevel, #183773. Don't set an early font if consolefont isn't in a runlevel, #183773.

7
src/runscript.c
View File

@ -656,8 +656,13 @@ static void svc_start (bool deps)
tmplist = NULL; tmplist = NULL;
STRLIST_FOREACH (services, svc, i) { STRLIST_FOREACH (services, svc, i) {
if (rc_service_state (svc, rc_service_started)) /* don't wait for services which went inactive but are now in
* starting state */
if (rc_service_state (svc, rc_service_started) ||
(rc_service_state (svc, rc_service_starting) &&
rc_service_state(svc, rc_service_wasinactive)))
continue; continue;
if (! rc_wait_service (svc)) if (! rc_wait_service (svc))
eerror ("%s: timed out waiting for %s", applet, svc); eerror ("%s: timed out waiting for %s", applet, svc);
if (rc_service_state (svc, rc_service_started)) if (rc_service_state (svc, rc_service_started))