From cbd5f5d7d6d652d52a18170123f5d08baf7e9862 Mon Sep 17 00:00:00 2001 From: Yu Watanabe Date: Fri, 6 Dec 2024 06:57:39 +0900 Subject: [PATCH] journalctl: show coredumps again when --unit= is specified MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This effectively reverts fdcd37df3b97abc381c7b7a29b81cc013c7a3230. After 888e378da2dbf4520e68a9d7e59712a3cd5a830f, coredumps for system services are stored by systemd-coredump user. Henve, _UID=0 does not match anything anymore. Before: ``` $ build/journalctl -u systemd-networkd.service -p2 -n1 -- No entries -- ``` After: ``` $ build/journalctl -u systemd-networkd.service -p2 -n1 Dec 06 05:39:55 H systemd-coredump[4187]: [🡕] Process 4145 (systemd-network) of user 192 dumped core. (snip) ``` --- src/shared/logs-show.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/src/shared/logs-show.c b/src/shared/logs-show.c index 0b28ce41173..95af913a5ad 100644 --- a/src/shared/logs-show.c +++ b/src/shared/logs-show.c @@ -1653,7 +1653,6 @@ int add_matches_for_unit_full(sd_journal *j, bool all, const char *unit) { /* Look for coredumps of the service */ (r = sd_journal_add_disjunction(j)) || (r = sd_journal_add_match(j, "MESSAGE_ID=" SD_MESSAGE_COREDUMP_STR, SIZE_MAX)) || - (r = sd_journal_add_match(j, "_UID=0", SIZE_MAX)) || (r = journal_add_match_pair(j, "COREDUMP_UNIT", unit)) ); @@ -1696,8 +1695,7 @@ int add_matches_for_user_unit_full(sd_journal *j, bool all, const char *unit) { /* Look for coredumps of the service */ (r = sd_journal_add_disjunction(j)) || (r = journal_add_match_pair(j, "COREDUMP_USER_UNIT", unit)) || - (r = journal_add_matchf(j, "_UID="UID_FMT, uid)) || - (r = sd_journal_add_match(j, "_UID=0", SIZE_MAX)) + (r = journal_add_matchf(j, "_UID="UID_FMT, uid)) ); if (r == 0 && all && endswith(unit, ".slice"))