From 4eab639f92c0e4fa1a1baee5575bf3bc21810dcf Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Tue, 22 Jun 2010 04:09:50 +0200 Subject: [PATCH] service: rework logic when we consider a service running --- src/service.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/src/service.c b/src/service.c index aff355112..e1dab70f8 100644 --- a/src/service.c +++ b/src/service.c @@ -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) -- 2.30.2