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/timer.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/timer.c')
| -rw-r--r-- | src/core/timer.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/core/timer.c b/src/core/timer.c index 3206296f09..e2b43f02f8 100644 --- a/src/core/timer.c +++ b/src/core/timer.c @@ -291,7 +291,7 @@ static int timer_coldplug(Unit *u) { static void timer_enter_dead(Timer *t, TimerResult f) { assert(t); - if (f != TIMER_SUCCESS) + if (t->result == TIMER_SUCCESS) t->result = f; timer_set_state(t, t->result != TIMER_SUCCESS ? TIMER_FAILED : TIMER_DEAD); |