From c4653a4dfe059fa5ec84157ba2cd7ab2fd7c3faa Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 4 Jun 2010 21:23:00 +0200 Subject: service: handle properly if a dbus process terminates before acquiring the dbus name --- src/service.c | 18 +++++++++++------- 1 file changed, 11 insertions(+), 7 deletions(-) (limited to 'src') diff --git a/src/service.c b/src/service.c index c276a9a276..8b1fab785a 100644 --- a/src/service.c +++ b/src/service.c @@ -1963,14 +1963,18 @@ static void service_sigchld_event(Unit *u, pid_t pid, int code, int status) { break; case SERVICE_START: - assert(s->type == SERVICE_FINISH); + if (s->type == SERVICE_FINISH) { + /* This was our main goal, so let's go on */ + if (success) + service_enter_start_post(s); + else + service_enter_signal(s, SERVICE_FINAL_SIGTERM, false); + break; + } else { + assert(s->type == SERVICE_DBUS); - /* This was our main goal, so let's go on */ - if (success) - service_enter_start_post(s); - else - service_enter_signal(s, SERVICE_FINAL_SIGTERM, false); - break; + /* Fall through */ + } case SERVICE_RUNNING: service_enter_running(s, success); -- cgit v1.2.3-54-g00ecf