chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
keymap: Tolerate invalid entries in keymaps
[elogind.git]
/
src
/
core
/
timer.c
diff --git
a/src/core/timer.c
b/src/core/timer.c
index 6bd4cc359cf62180386530df533104c9a8a34193..7080b32c6b50bf06e8184f0277045eb9274521e7 100644
(file)
--- a/
src/core/timer.c
+++ b/
src/core/timer.c
@@
-80,7
+80,7
@@
static int timer_add_default_dependencies(Timer *t) {
assert(t);
assert(t);
- if (UNIT(t)->manager->running_as ==
MANAGER
_SYSTEM) {
+ if (UNIT(t)->manager->running_as ==
SYSTEMD
_SYSTEM) {
if ((r = unit_add_dependency_by_name(UNIT(t), UNIT_BEFORE, SPECIAL_BASIC_TARGET, NULL, true)) < 0)
return r;
if ((r = unit_add_dependency_by_name(UNIT(t), UNIT_BEFORE, SPECIAL_BASIC_TARGET, NULL, true)) < 0)
return r;
@@
-222,7
+222,7
@@
static void timer_enter_waiting(Timer *t, bool initial) {
break;
case TIMER_STARTUP:
break;
case TIMER_STARTUP:
- base = UNIT(t)->manager->
startup
_timestamp.monotonic;
+ base = UNIT(t)->manager->
userspace
_timestamp.monotonic;
break;
case TIMER_UNIT_ACTIVE:
break;
case TIMER_UNIT_ACTIVE:
@@
-486,7
+486,6
@@
static const char* const timer_result_table[_TIMER_RESULT_MAX] = {
DEFINE_STRING_TABLE_LOOKUP(timer_result, TimerResult);
const UnitVTable timer_vtable = {
DEFINE_STRING_TABLE_LOOKUP(timer_result, TimerResult);
const UnitVTable timer_vtable = {
- .suffix = ".timer",
.object_size = sizeof(Timer),
.sections =
"Unit\0"
.object_size = sizeof(Timer),
.sections =
"Unit\0"