Commit 4eab639f authored by Lennart Poettering's avatar Lennart Poettering

service: rework logic when we consider a service running

parent 827119a9
......@@ -1587,13 +1587,16 @@ fail:
}
static void service_enter_running(Service *s, bool success) {
int main_pid_ok, cgroup_ok;
assert(s);
if (!success)
s->failure = true;
if (main_pid_good(s) != 0 &&
cgroup_good(s) != 0 &&
main_pid_ok = main_pid_good(s);
cgroup_ok = cgroup_good(s);
if ((main_pid_ok > 0 || (main_pid_ok < 0 && cgroup_ok != 0)) &&
(s->bus_name_good || s->type != SERVICE_DBUS))
service_set_state(s, SERVICE_RUNNING);
else if (s->valid_no_process)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment