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

When shutting down, stop the service even if dependants failed.

Browse Source
This commit is contained in:
Roy Marples 2007-08-17 11:31:36 +00:00
parent bc90e41b76
commit adbe039385
1 changed files with 10 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
src/runscript.c
View File

@ -879,8 +879,17 @@ static void svc_stop (bool deps)
/* We used to loop 3 times here - maybe re-do this if needed */ /* We used to loop 3 times here - maybe re-do this if needed */
rc_wait_service (svc); rc_wait_service (svc);
if (! rc_service_state (svc, rc_service_stopped)) { if (! rc_service_state (svc, rc_service_stopped)) {
if (rc_runlevel_stopping ())
if (rc_runlevel_stopping ()) {
/* If shutting down, we should stop even if a dependant failed */
if (softlevel &&
(strcmp (softlevel, RC_LEVEL_SHUTDOWN) == 0 ||
strcmp (softlevel, RC_LEVEL_REBOOT) == 0 ||
strcmp (softlevel, RC_LEVEL_SINGLE) == 0))
continue;
rc_mark_service (svc, rc_service_failed); rc_mark_service (svc, rc_service_failed);
}
eerrorx ("ERROR: cannot stop %s as %s is still up", eerrorx ("ERROR: cannot stop %s as %s is still up",
applet, svc); applet, svc);
} }