daandemeyer / rpms / systemd

Forked from rpms/systemd 2 years ago
Clone
Brian Stinson 2593d8
From 33aa231f5bf3335cdacfb38ffba757865019ce4d Mon Sep 17 00:00:00 2001
Brian Stinson 2593d8
From: =?UTF-8?q?Renaud=20M=C3=A9trich?=
Brian Stinson 2593d8
 <1163635+rmetrich@users.noreply.github.com>
Brian Stinson 2593d8
Date: Mon, 3 Sep 2018 05:42:39 +0200
Brian Stinson 2593d8
Subject: [PATCH] journald: fixed assertion failure when system journal
Brian Stinson 2593d8
 rotation fails (#9893)
Brian Stinson 2593d8
Brian Stinson 2593d8
(cherry picked from commit fd790d6f09b10a87b007b71403cb018f18ff91c9)
Brian Stinson 2593d8
Brian Stinson 2593d8
Resolves: #1763619
Brian Stinson 2593d8
---
Brian Stinson 2593d8
 src/journal/journald-server.c | 3 ++-
Brian Stinson 2593d8
 1 file changed, 2 insertions(+), 1 deletion(-)
Brian Stinson 2593d8
Brian Stinson 2593d8
diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
Brian Stinson 2593d8
index 0c983e102a..6aecb67d6c 100644
Brian Stinson 2593d8
--- a/src/journal/journald-server.c
Brian Stinson 2593d8
+++ b/src/journal/journald-server.c
Brian Stinson 2593d8
@@ -1041,7 +1041,8 @@ int server_flush_to_var(Server *s, bool require_flag_file) {
Brian Stinson 2593d8
         r = 0;
Brian Stinson 2593d8
 
Brian Stinson 2593d8
 finish:
Brian Stinson 2593d8
-        journal_file_post_change(s->system_journal);
Brian Stinson 2593d8
+        if (s->system_journal)
Brian Stinson 2593d8
+                journal_file_post_change(s->system_journal);
Brian Stinson 2593d8
 
Brian Stinson 2593d8
         s->runtime_journal = journal_file_close(s->runtime_journal);
Brian Stinson 2593d8