X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=src%2Ftimer.c;h=b025051f2b77a0d3000b45af545a9cd1a2542d3b;hp=e95b4d66e10e3b1262cf4da292b817ef882ee163;hb=01f78473b104d28db0fa813414092bc6358ae521;hpb=871d7de47c13ee6cd78b8eefdf9128be3c740ac0

diff --git a/src/timer.c b/src/timer.c
index e95b4d66e..b025051f2 100644
--- a/src/timer.c
+++ b/src/timer.c
@@ -41,7 +41,6 @@ static void timer_init(Unit *u) {
         assert(u->meta.load_state == UNIT_STUB);
 
         t->next_elapse = (usec_t) -1;
-        t->timer_watch.type = WATCH_INVALID;
 }
 
 static void timer_done(Unit *u) {
@@ -274,8 +273,12 @@ static int timer_start(Unit *u) {
         Timer *t = TIMER(u);
 
         assert(t);
-        assert(t->state == TIMER_DEAD);
+        assert(t->state == TIMER_DEAD || t->state == TIMER_MAINTAINANCE);
+
+        if (t->unit->meta.load_state != UNIT_LOADED)
+                return -ENOENT;
 
+        t->failure = false;
         timer_enter_waiting(t, true);
         return 0;
 }
@@ -373,9 +376,12 @@ void timer_unit_notify(Unit *u, UnitActiveState new_state) {
                 if (!p)
                         continue;
 
+                if (p->meta.load_state != UNIT_LOADED)
+                        continue;
+
                 t = TIMER(p);
 
-                if (t->meta.load_state != UNIT_LOADED)
+                if (t->unit != u)
                         continue;
 
                 /* Reenable all timers that depend on unit state */