1
0
mirror of https://github.com/systemd/systemd.git synced 2025-03-06 00:58:29 +03:00

journalctl-filter: use add_match_boot_id() instead of add_match_this_boot()

The function add_match_this_boot() calls sd_journal_add_conjunction(),
hence, we cannot specify multiple devices in the extra match arguments,
e.g., "journalctl /dev/sda /dev/sdb" shows no entry.
This commit is contained in:
Yu Watanabe 2024-03-22 17:46:00 +09:00 committed by Luca Boccassi
parent 1eba24dac4
commit af41f9f8ad

View File

@ -385,11 +385,7 @@ get_parent:
break;
}
r = add_match_this_boot(j, arg_machine);
if (r < 0)
return log_error_errno(r, "Failed to add match for the current boot: %m");
return 0;
return add_match_boot_id(j, SD_ID128_NULL);
}
static int add_matches_for_path(sd_journal *j, const char *path) {