shaba/systemd
1
0
Fork 0
mirror of https://github.com/systemd/systemd.git synced 2024-10-29 21:55:36 +03:00
Code

logs-show: Always retrieve the boot ID from the entry

Browse Source 
If _SOURCE_MONOTONIC_TIMESTAMP was set in the entry, we wouldn't
query the boot ID, leading to every kernel entry in the export mode
to have BOOT_ID=000000000000000. Let's fix this by always querying
the boot ID.
This commit is contained in:
Daan De Meyer 2022-10-11 13:26:41 +02:00 committed by Zbigniew Jędrzejewski-Szmek
parent a5a0da085a
commit 88ee6a9e4b
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/shared/logs-show.c
View File

@ -1289,8 +1289,10 @@ static int get_dual_timestamp(sd_journal *j, dual_timestamp *ret_ts, sd_id128_t
if (monotonic)
r = safe_atou64(monotonic, &ret_ts->monotonic);
if (!monotonic || r < 0 || !VALID_MONOTONIC(ret_ts->monotonic))
r = sd_journal_get_monotonic_usec(j, &ret_ts->monotonic, ret_boot_id);
r = sd_journal_get_monotonic_usec(
j,
!monotonic || r < 0 || !VALID_MONOTONIC(ret_ts->monotonic) ? &ret_ts->monotonic : NULL,
ret_boot_id);
if (r < 0)
ret_ts->monotonic = USEC_INFINITY;