chiark / gitweb /
timer: when deserializing timer state stay elapsed when we are elapsed
authorLennart Poettering <lennart@poettering.net>
Thu, 28 Oct 2010 02:04:50 +0000 (04:04 +0200)
committerLennart Poettering <lennart@poettering.net>
Thu, 28 Oct 2010 02:04:50 +0000 (04:04 +0200)
TODO
src/timer.c

diff --git a/TODO b/TODO
index 67d397e3412e0ad56d6ab1c1716c6a0fdaba0555..a01f2a99537cabb56033eb3dda46d12f0090df4e 100644 (file)
--- a/TODO
+++ b/TODO
@@ -64,8 +64,6 @@
 
 * parse early boot time env var from dracut
 
 
 * parse early boot time env var from dracut
 
-* add switch to disable pull in retroactively
-
 * cryptsetup
 
 * add seperate man page for [Install] settings
 * cryptsetup
 
 * add seperate man page for [Install] settings
index b01944ccdbd34ae81322c74c66977280f91fb00a..627a360fe6f339f5a2e413b72e1e4101742eed55 100644 (file)
@@ -161,9 +161,7 @@ static int timer_coldplug(Unit *u) {
 
         if (t->deserialized_state != t->state) {
 
 
         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);
                         timer_enter_waiting(t, false);
                 else
                         timer_set_state(t, t->deserialized_state);