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:
47a1454
)
journald-server: r should be checked after journal_file_open_reliably
author
Lukas Nykryn
<lnykryn@redhat.com>
Tue, 9 Jul 2013 13:45:37 +0000
(15:45 +0200)
committer
Lennart Poettering
<lennart@poettering.net>
Thu, 11 Jul 2013 23:18:16 +0000
(
01:18
+0200)
src/journal/journald-server.c
patch
|
blob
|
history
diff --git
a/src/journal/journald-server.c
b/src/journal/journald-server.c
index 44ba916f1045d56f262f9d9385afc206a2c03ae1..6beaa8a72932da5170407007f0d2ed5016bfd0f6 100644
(file)
--- a/
src/journal/journald-server.c
+++ b/
src/journal/journald-server.c
@@
-910,11
+910,12
@@
static int system_journal_open(Server *s) {
if (r >= 0)
server_fix_perms(s, s->system_journal, 0);
if (r >= 0)
server_fix_perms(s, s->system_journal, 0);
-
}
else if (r < 0) {
- if (r != -ENOENT && r != -EROFS)
- log_warning("Failed to open system journal: %s", strerror(-r));
+
else if (r < 0) {
+
if (r != -ENOENT && r != -EROFS)
+
log_warning("Failed to open system journal: %s", strerror(-r));
- r = 0;
+ r = 0;
+ }
}
if (!s->runtime_journal &&
}
if (!s->runtime_journal &&