chiark
/
gitweb
/
~ianmdlvl
/
elogind.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(from parent 1:
0898429
)
journal: fix SD_JOURNAL_SYSTEM_ONLY flag
author
Lennart Poettering
<lennart@poettering.net>
Sat, 9 Jun 2012 13:03:22 +0000
(15:03 +0200)
committer
Lennart Poettering
<lennart@poettering.net>
Sat, 16 Jun 2012 22:03:12 +0000
(
00:03
+0200)
src/journal/sd-journal.c
patch
|
blob
|
history
diff --git
a/src/journal/sd-journal.c
b/src/journal/sd-journal.c
index 5ed8c3f7a5a6ae4b4f2d95fcb31fdae206b5a40b..9c6cbaac5108856aacdc05188d9e256e855355d2 100644
(file)
--- 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)