summaryrefslogtreecommitdiff
path: root/src/journal
diff options
context:
space:
mode:
authorMarcin Bachry <hegel666@gmail.com>2016-12-24 00:42:13 +0100
committerLennart Poettering <lennart@poettering.net>2016-12-24 00:42:13 +0100
commit574b77efadb285c5c4c2773b0241a05fe56450ed (patch)
treeb4ec15cccb3ca5f21046919cab2c7e7e6e80fbc1 /src/journal
parent357cd5563a40a65306901ea2c7cbf121244b76e9 (diff)
journalctl: add remote log dir to search path when --merge is passed (#4970)
The journalctl man page says: "-m, --merge Show entries interleaved from all available journals, including remote ones.", but current version of journalctl doesn't live up to this promise. This patch simply adds "/var/log/journal/remote" to search path if --merge flag is used. Should fix issue #3618
Diffstat (limited to 'src/journal')
-rw-r--r--src/journal/sd-journal.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/src/journal/sd-journal.c b/src/journal/sd-journal.c
index 56257c41d4..71967a0f33 100644
--- a/src/journal/sd-journal.c
+++ b/src/journal/sd-journal.c
@@ -1661,6 +1661,9 @@ static int add_search_paths(sd_journal *j) {
NULSTR_FOREACH(p, search_paths)
(void) add_root_directory(j, p, true);
+ if (!(j->flags & SD_JOURNAL_LOCAL_ONLY))
+ (void) add_root_directory(j, "/var/log/journal/remote", true);
+
return 0;
}