From f23b6d0e95346a93db3fbf8dbec300f8e6a7b12a Mon Sep 17 00:00:00 2001 From: Roy Marples Date: Mon, 2 Jul 2007 22:07:58 +0000 Subject: Don't wait for services that were inactive, #183667 thanks to Daniel Drake --- src/runscript.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'src/runscript.c') diff --git a/src/runscript.c b/src/runscript.c index 18515372..8bebf746 100644 --- a/src/runscript.c +++ b/src/runscript.c @@ -656,8 +656,13 @@ static void svc_start (bool deps) tmplist = NULL; 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; + if (! rc_wait_service (svc)) eerror ("%s: timed out waiting for %s", applet, svc); if (rc_service_state (svc, rc_service_started)) -- cgit v1.2.3