summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLukas Nykryn <lnykryn@redhat.com>2013-07-09 15:45:37 +0200
committerLennart Poettering <lennart@poettering.net>2013-07-12 01:18:16 +0200
commit433dd100442e8197868def975c6fd38b48dc6439 (patch)
tree8bad43ebbdba198311d986824e98e64b49b6ad40
parent47a1454f707dff2e5d1db2f8bfcc406805d4d450 (diff)
journald-server: r should be checked after journal_file_open_reliably
-rw-r--r--src/journal/journald-server.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
index 44ba916f10..6beaa8a729 100644
--- 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);
- } 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 &&