aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRoy Marples <roy@marples.name>2009-06-01 20:10:42 +0100
committerRoy Marples <roy@marples.name>2009-06-01 20:10:42 +0100
commitc3e9a7ec14b1120ecae7b9e4a2125dda01eec9b7 (patch)
tree6137e801f7b376a23f4d23356e4f3368eaec8ed1
parentefec0b5012efd7af5a882348c62e28f3e62c58fc (diff)
Warn about going inactive correctly.
-rw-r--r--src/rc/runscript.c9
1 files changed, 3 insertions, 6 deletions
diff --git a/src/rc/runscript.c b/src/rc/runscript.c
index 44da58c5..91a31a59 100644
--- a/src/rc/runscript.c
+++ b/src/rc/runscript.c
@@ -755,13 +755,10 @@ static void svc_start_real()
if (ibsave)
unsetenv("IN_BACKGROUND");
- if (!started)
+ if (rc_service_state(service) & RC_SERVICE_INACTIVE)
+ ewarnx("WARNING: %s has started, but is inactive", applet);
+ else if (!started)
eerrorx("ERROR: %s failed to start", applet);
- else {
- if (rc_service_state(service) & RC_SERVICE_INACTIVE)
- ewarnx("WARNING: %s has started, but is inactive",
- applet);
- }
rc_service_mark(service, RC_SERVICE_STARTED);
exclusive_fd = svc_unlock(applet, exclusive_fd);