From: Sven Eden <yamakuzure@gmx.net>
Date: Thu, 22 Jun 2017 16:21:16 +0000 (+0200)
Subject: Prep v231.2: Mask get_startup_time(), it won't work without systemd running the show... 
X-Git-Tag: v231.3~20
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=d2518343f597c74490e52afde69bc236e71b8778;hp=87cacc7da35692ccde9e99341fefe58ef6ed29ba;p=elogind.git

Prep v231.2: Mask get_startup_time(), it won't work without systemd running the show anyway.
---

diff --git a/src/update-utmp/update-utmp.c b/src/update-utmp/update-utmp.c
index 655615fc0..af1665733 100644
--- a/src/update-utmp/update-utmp.c
+++ b/src/update-utmp/update-utmp.c
@@ -49,6 +49,7 @@ typedef struct Context {
 #endif
 } Context;
 
+#if 0 /// UNNEEDED by elogind
 static usec_t get_startup_time(Context *c) {
         _cleanup_(sd_bus_error_free) sd_bus_error error = SD_BUS_ERROR_NULL;
         usec_t t = 0;
@@ -68,11 +69,9 @@ static usec_t get_startup_time(Context *c) {
                 log_error_errno(r, "Failed to get timestamp: %s", bus_error_message(&error, r));
                 return 0;
         }
-
         return t;
 }
 
-#if 0 /// UNNEEDED by elogind
 static int get_current_runlevel(Context *c) {
         static const struct {
                 const int runlevel;
@@ -137,9 +136,13 @@ static int on_reboot(Context *c) {
                 }
 #endif
 
+#if 0 /// systemd hasn't started the system, so elogind always uses NOW()
         /* If this call fails it will return 0, which
          * utmp_put_reboot() will then fix to the current time */
         t = get_startup_time(c);
+#else
+        t = now(CLOCK_REALTIME);
+#endif // 0
 
         q = utmp_put_reboot(t);
         if (q < 0) {