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

This commit is contained in:
Lennart Poettering 2010-10-28 04:04:50 +02:00
parent f14e15f8af
commit b363ca6f20
2 changed files with 1 additions and 5 deletions

2
TODO
View File

@ -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 * cryptsetup
* add seperate man page for [Install] settings * add seperate man page for [Install] settings

View 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 || if (t->deserialized_state == TIMER_WAITING)
t->deserialized_state == TIMER_RUNNING ||
t->deserialized_state == TIMER_ELAPSED)
timer_enter_waiting(t, false); timer_enter_waiting(t, false);
else else
timer_set_state(t, t->deserialized_state); timer_set_state(t, t->deserialized_state);