diff options
| author | Lennart Poettering <lennart@poettering.net> | 2010-06-04 21:23:00 +0200 |
|---|---|---|
| committer | Lennart Poettering <lennart@poettering.net> | 2010-06-04 21:23:00 +0200 |
| commit | c4653a4dfe059fa5ec84157ba2cd7ab2fd7c3faa (patch) | |
| tree | 2a6cb691755b4ce76e874bf1f0f0c8a1b44654ca | |
| parent | b410e6b951695847619d18952bb9e2622c8b2bbf (diff) | |
service: handle properly if a dbus process terminates before acquiring the dbus name
| -rw-r--r-- | src/service.c | 18 |
1 files changed, 11 insertions, 7 deletions
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); |