X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=src%2Fcore%2Ftimer.c;h=7080b32c6b50bf06e8184f0277045eb9274521e7;hb=774de5a97fe69da822fde77b88af8d970ab5d0c6;hp=6bd4cc359cf62180386530df533104c9a8a34193;hpb=5430f7f2bc7330f3088b894166bf3524a067e3d8;p=elogind.git

diff --git a/src/core/timer.c b/src/core/timer.c
index 6bd4cc359..7080b32c6 100644
--- a/src/core/timer.c
+++ b/src/core/timer.c
@@ -80,7 +80,7 @@ static int timer_add_default_dependencies(Timer *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;
 
@@ -222,7 +222,7 @@ static void timer_enter_waiting(Timer *t, bool initial) {
                         break;
 
                 case TIMER_STARTUP:
-                        base = UNIT(t)->manager->startup_timestamp.monotonic;
+                        base = UNIT(t)->manager->userspace_timestamp.monotonic;
                         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 = {
-        .suffix = ".timer",
         .object_size = sizeof(Timer),
         .sections =
                 "Unit\0"