diff options
| author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2016-08-05 20:55:08 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2016-08-05 20:55:08 -0400 |
| commit | 3bb81a80bd18c15a1befb4de9a4cf9a5b77ae354 (patch) | |
| tree | 5111e551e67104dd8321f8fb78602d35c24f8b30 /src/core/scope.c | |
| parent | b760a9af902c73ae76a05e17374e12e8e6c4e629 (diff) | |
| parent | b08af3b12706f352f651e70e117f6d6dcf11a911 (diff) | |
Merge pull request #3818 from poettering/exit-status-env
beef up /var/tmp and /tmp handling; set $SERVICE_RESULT/$EXIT_CODE/$EXIT_STATUS on ExecStop= and make sure root/nobody are always resolvable
Diffstat (limited to 'src/core/scope.c')
| -rw-r--r-- | src/core/scope.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/core/scope.c b/src/core/scope.c index b45e238974..b278aed3d6 100644 --- a/src/core/scope.c +++ b/src/core/scope.c @@ -221,7 +221,7 @@ static void scope_dump(Unit *u, FILE *f, const char *prefix) { static void scope_enter_dead(Scope *s, ScopeResult f) { assert(s); - if (f != SCOPE_SUCCESS) + if (s->result == SCOPE_SUCCESS) s->result = f; scope_set_state(s, s->result != SCOPE_SUCCESS ? SCOPE_FAILED : SCOPE_DEAD); @@ -233,7 +233,7 @@ static void scope_enter_signal(Scope *s, ScopeState state, ScopeResult f) { assert(s); - if (f != SCOPE_SUCCESS) + if (s->result == SCOPE_SUCCESS) s->result = f; unit_watch_all_pids(UNIT(s)); |