diff options
| author | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-19 09:15:56 +0000 |
|---|---|---|
| committer | Daniel Baumann <daniel.baumann@progress-linux.org> | 2024-06-19 09:15:56 +0000 |
| commit | 4734276537dec7ae1bbae9a4beae730f3a735e56 (patch) | |
| tree | 8a04cc78615164edb390291635e9567c74b9cda9 /src/shared/logs-show.c | |
| parent | Releasing progress-linux version 256-2~progress7.99u1. (diff) | |
| download | systemd-4734276537dec7ae1bbae9a4beae730f3a735e56.tar.xz systemd-4734276537dec7ae1bbae9a4beae730f3a735e56.zip | |
Merging upstream version 256.1.
Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>
Diffstat (limited to 'src/shared/logs-show.c')
| -rw-r--r-- | src/shared/logs-show.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/src/shared/logs-show.c b/src/shared/logs-show.c index c71c868..153a411 100644 --- a/src/shared/logs-show.c +++ b/src/shared/logs-show.c @@ -450,6 +450,9 @@ static void parse_display_realtime( assert(j); assert(ret); + // FIXME: _SOURCE_MONOTONIC_TIMESTAMP is in CLOCK_BOOTTIME, hence we cannot use it for adjusting realtime. + source_monotonic = NULL; + /* First, try _SOURCE_REALTIME_TIMESTAMP. */ if (source_realtime && safe_atou64(source_realtime, &t) >= 0 && VALID_REALTIME(t)) { *ret = t; @@ -488,6 +491,9 @@ static void parse_display_timestamp( assert(ret_display_ts); assert(ret_boot_id); + // FIXME: _SOURCE_MONOTONIC_TIMESTAMP is in CLOCK_BOOTTIME, hence we cannot use it for adjusting realtime. + source_monotonic = NULL; + if (source_realtime && safe_atou64(source_realtime, &t) >= 0 && VALID_REALTIME(t)) source_ts.realtime = t; |