diff options
author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2016-10-10 21:24:57 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-10-10 21:24:57 -0400 |
commit | ec72b963666020003d780fcc0751bc84da14e258 (patch) | |
tree | f65b1621f23a506a08e10b42a024890c572b396a /src/core/service.c | |
parent | 19f0cf65c945884d19c91667a683dac084f0a944 (diff) | |
parent | 052364d41f432c5a2357122a41d5f60cabb63a5e (diff) |
Merge pull request #4337 from poettering/exit-code
Fix for #4275 and more
Diffstat (limited to 'src/core/service.c')
-rw-r--r-- | src/core/service.c | 3 |
1 files changed, 1 insertions, 2 deletions
diff --git a/src/core/service.c b/src/core/service.c index 99a70395fc..98edc437a2 100644 --- a/src/core/service.c +++ b/src/core/service.c @@ -2600,8 +2600,7 @@ static void service_sigchld_event(Unit *u, pid_t pid, int code, int status) { assert(s); assert(pid >= 0); - if (UNIT(s)->fragment_path ? is_clean_exit(code, status, &s->success_status) : - is_clean_exit_lsb(code, status, &s->success_status)) + if (is_clean_exit(code, status, s->type == SERVICE_ONESHOT ? EXIT_CLEAN_COMMAND : EXIT_CLEAN_DAEMON, &s->success_status)) f = SERVICE_SUCCESS; else if (code == CLD_EXITED) f = SERVICE_FAILURE_EXIT_CODE; |