From: Lennart Poettering <lennart@poettering.net>
Date: Thu, 28 Oct 2010 02:04:50 +0000 (+0200)
Subject: timer: when deserializing timer state stay elapsed when we are elapsed
X-Git-Tag: v12~122
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=b363ca6f206258acff8bc0a27dc72a99210011a8

timer: when deserializing timer state stay elapsed when we are elapsed
---

diff --git a/TODO b/TODO
index 67d397e34..a01f2a995 100644
--- a/TODO
+++ b/TODO
@@ -64,8 +64,6 @@
 
 * parse early boot time env var from dracut
 
-* add switch to disable pull in retroactively
-
 * cryptsetup
 
 * add seperate man page for [Install] settings
diff --git a/src/timer.c b/src/timer.c
index b01944ccd..627a360fe 100644
--- a/src/timer.c
+++ b/src/timer.c
@@ -161,9 +161,7 @@ static int timer_coldplug(Unit *u) {
 
         if (t->deserialized_state != t->state) {
 
-                if (t->deserialized_state == TIMER_WAITING ||
-                    t->deserialized_state == TIMER_RUNNING ||
-                    t->deserialized_state == TIMER_ELAPSED)
+                if (t->deserialized_state == TIMER_WAITING)
                         timer_enter_waiting(t, false);
                 else
                         timer_set_state(t, t->deserialized_state);