diff options
| author | Sven Eden <yamakuzure@gmx.net> | 2017-06-22 18:21:16 +0200 |
|---|---|---|
| committer | Sven Eden <yamakuzure@gmx.net> | 2017-06-22 18:23:54 +0200 |
| commit | d2518343f597c74490e52afde69bc236e71b8778 (patch) | |
| tree | 8501da96cabd05b7ec92816e0351b5594a34714c /src/update-utmp/update-utmp.c | |
| parent | 87cacc7da35692ccde9e99341fefe58ef6ed29ba (diff) | |
Prep v231.2: Mask get_startup_time(), it won't work without systemd running the show anyway.
Diffstat (limited to 'src/update-utmp/update-utmp.c')
| -rw-r--r-- | src/update-utmp/update-utmp.c | 7 |
1 files changed, 5 insertions, 2 deletions
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) { |