From: Lennart Poettering <lennart@poettering.net>
Date: Sat, 9 Jun 2012 13:03:22 +0000 (+0200)
Subject: journal: fix SD_JOURNAL_SYSTEM_ONLY flag
X-Git-Tag: v186~148
X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;ds=sidebyside;h=38a6db16dc6f3ac6e6f497c90e51fb9904d785ba;p=elogind.git

journal: fix SD_JOURNAL_SYSTEM_ONLY flag
---

diff --git a/src/journal/sd-journal.c b/src/journal/sd-journal.c
index 5ed8c3f7a..9c6cbaac5 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)