summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2010-10-28 04:04:50 +0200
committerLennart Poettering <lennart@poettering.net>2010-10-28 04:04:50 +0200
commitb363ca6f206258acff8bc0a27dc72a99210011a8 (patch)
tree8ea1fd1e936291361f7e2e6c1b504f208ad4104e
parentf14e15f8affe906a45d8afc76c302a49cd1f70ee (diff)
timer: when deserializing timer state stay elapsed when we are elapsed
-rw-r--r--TODO2
-rw-r--r--src/timer.c4
2 files changed, 1 insertions, 5 deletions
diff --git a/TODO b/TODO
index 67d397e341..a01f2a9953 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 b01944ccdb..627a360fe6 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);