chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fedora: further unit tweaks
[elogind.git]
/
src
/
timer.c
diff --git
a/src/timer.c
b/src/timer.c
index 0dcaad509184132473996ffea2f8799e27adc943..065e9c14dbf7905f3df603f8922351305425f1b3 100644
(file)
--- a/
src/timer.c
+++ b/
src/timer.c
@@
-82,7
+82,7
@@
static int timer_add_default_dependencies(Timer *t) {
if ((r = unit_add_two_dependencies_by_name(UNIT(t), UNIT_AFTER, UNIT_REQUIRES, SPECIAL_SYSINIT_TARGET, NULL, true)) < 0)
return r;
if ((r = unit_add_two_dependencies_by_name(UNIT(t), UNIT_AFTER, UNIT_REQUIRES, SPECIAL_SYSINIT_TARGET, NULL, true)) < 0)
return r;
- return unit_add_two_dependencies_by_name(UNIT(t), UNIT_BEFORE, UNIT_CONFLICT
ED_BY
, SPECIAL_SHUTDOWN_TARGET, NULL, true);
+ return unit_add_two_dependencies_by_name(UNIT(t), UNIT_BEFORE, UNIT_CONFLICT
S
, SPECIAL_SHUTDOWN_TARGET, NULL, true);
}
static int timer_load(Unit *u) {
}
static int timer_load(Unit *u) {
@@
-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);
@@
-197,9
+195,9
@@
static void timer_enter_waiting(Timer *t, bool initial) {
switch (v->base) {
case TIMER_ACTIVE:
switch (v->base) {
case TIMER_ACTIVE:
- if (state_translation_table[t->state] == UNIT_ACTIVE)
{
+ if (state_translation_table[t->state] == UNIT_ACTIVE)
base = t->meta.inactive_exit_timestamp.monotonic;
base = t->meta.inactive_exit_timestamp.monotonic;
-
}
else
+ else
base = n;
break;
base = n;
break;