X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=src%2Fservice.c;h=5243e690df07426940109932db106ad2a06a97d0;hb=99e68c0b2d6ca9d491036920fcbca4c8d54404a8;hp=07137d265d3fab1b05c5ebac5b9601da8fc4c0f7;hpb=3a11183858af30bc9b4e9dac430dd7541deec19b;p=elogind.git diff --git a/src/service.c b/src/service.c index 07137d265..5243e690d 100644 --- a/src/service.c +++ b/src/service.c @@ -2870,20 +2870,22 @@ static void service_sigchld_event(Unit *u, pid_t pid, int code, int status) { break; case SERVICE_START_POST: - if (success) { - if (s->pid_file) { - int r = service_load_pid_file(s, true); - if (r < 0) { - r = service_demand_pid_file(s); - if (r < 0 || !cgroup_good(s)) - service_enter_stop(s, false); - break; - } - } else - service_search_main_pid(s); + if (!success) { + service_enter_stop(s, false); + break; } - s->reload_failure = !success; + if (s->pid_file) { + int r = service_load_pid_file(s, true); + if (r < 0) { + r = service_demand_pid_file(s); + if (r < 0 || !cgroup_good(s)) + service_enter_stop(s, false); + break; + } + } else + service_search_main_pid(s); + service_enter_running(s, true); break;