morgan/systemd
1
0
Fork 0
mirror of https://github.com/morgan9e/systemd synced 2026-04-14 00:14:32 +09:00
Code Issues Packages Projects Releases Wiki Activity

Revert "journalctl: show coredumps again when --unit= is specified"

Browse Source 
This reverts commit cbd5f5d7d6.
This commit is contained in:
Zbigniew Jędrzejewski-Szmek
2024-12-06 11:11:24 +01:00
committed by Yu Watanabe
parent cbd5f5d7d6
commit 560412148f
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1653,6 +1653,7 @@ 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))
);
@@ -1695,7 +1696,8 @@ 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 = journal_add_matchf(j, "_UID="UID_FMT, uid)) ||
(r = sd_journal_add_match(j, "_UID=0", SIZE_MAX))
);
if (r == 0 && all && endswith(unit, ".slice"))