diff options
author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2016-10-11 13:40:50 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2016-10-11 13:40:50 -0400 |
commit | b744e8937ce603090a9bf64ac7d8cc2c1a29e4f0 (patch) | |
tree | d6873059fd870c78dae268671ad0e12ac8c493db /src/core/timer.c | |
parent | 40f45ff0c339971fd088e6f9cc2e61444087685d (diff) | |
parent | a46eac1bbddcdd15e741fc6c8389078db1067f81 (diff) |
Merge pull request #4067 from poettering/invocation-id
Add an "invocation ID" concept to the service manager
Diffstat (limited to 'src/core/timer.c')
-rw-r--r-- | src/core/timer.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/src/core/timer.c b/src/core/timer.c index e2b43f02f8..9538059c13 100644 --- a/src/core/timer.c +++ b/src/core/timer.c @@ -616,6 +616,10 @@ static int timer_start(Unit *u) { return r; } + r = unit_acquire_invocation_id(u); + if (r < 0) + return r; + t->last_trigger = DUAL_TIMESTAMP_NULL; /* Reenable all timers that depend on unit activation time */ @@ -632,7 +636,7 @@ static int timer_start(Unit *u) { /* The timer has never run before, * make sure a stamp file exists. */ - touch_file(t->stamp_path, true, USEC_INFINITY, UID_INVALID, GID_INVALID, MODE_INVALID); + (void) touch_file(t->stamp_path, true, USEC_INFINITY, UID_INVALID, GID_INVALID, MODE_INVALID); } t->result = TIMER_SUCCESS; |