summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl>2024-12-06 11:11:24 +0100
committerYu Watanabe <watanabe.yu+github@gmail.com>2024-12-06 18:21:51 +0100
commit560412148fa62d779ea522d43960dd3acd44b261 (patch)
treec6c6de4945f1eb9669c2df677b7eab6e5f1afe8a
parentjournalctl: show coredumps again when --unit= is specified (diff)
downloadsystemd-560412148fa62d779ea522d43960dd3acd44b261.tar.xz
systemd-560412148fa62d779ea522d43960dd3acd44b261.zip
Revert "journalctl: show coredumps again when --unit= is specified"
This reverts commit cbd5f5d7d6d652d52a18170123f5d08baf7e9862.
-rw-r--r--src/shared/logs-show.c4
1 files changed, 3 insertions, 1 deletions
diff --git a/src/shared/logs-show.c b/src/shared/logs-show.c
index 95af913a5a..0b28ce4117 100644
--- a/src/shared/logs-show.c
+++ b/src/shared/logs-show.c
@@ -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"))