summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2012-06-09 15:03:22 +0200
committerLennart Poettering <lennart@poettering.net>2012-06-17 00:03:12 +0200
commit38a6db16dc6f3ac6e6f497c90e51fb9904d785ba (patch)
tree52080caef664f257d4b761d944fc92784ad1e227
parent089842938dd0f4080084044bb9a1a3b00137926a (diff)
journal: fix SD_JOURNAL_SYSTEM_ONLY flag
-rw-r--r--src/journal/sd-journal.c3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/journal/sd-journal.c b/src/journal/sd-journal.c
index 5ed8c3f7a5..9c6cbaac51 100644
--- a/src/journal/sd-journal.c
+++ b/src/journal/sd-journal.c
@@ -943,7 +943,8 @@ static int add_file(sd_journal *j, const char *prefix, const char *dir, const ch
assert(filename);
if ((j->flags & SD_JOURNAL_SYSTEM_ONLY) &&
- !startswith(filename, "system.journal"))
+ !(streq(filename, "system.journal") ||
+ (startswith(filename, "system@") && endswith(filename, ".journal"))))
return 0;
if (dir)