From 7fdcc0e9cc7f047a778a2f1776d2398f46c6ac86 Mon Sep 17 00:00:00 2001

From: =?UTF-8?q?Renaud=20M=C3=A9trich?=

 <1163635+rmetrich@users.noreply.github.com>

Date: Mon, 3 Sep 2018 05:42:39 +0200

Subject: [PATCH] journald: fixed assertion failure when system journal

 rotation fails (#9893)

(cherry picked from commit fd790d6f09b10a87b007b71403cb018f18ff91c9)

(cherry picked from commit 33aa231f5bf3335cdacfb38ffba757865019ce4d)

Related: #1781712

---

 src/journal/journald-server.c | 3 ++-

 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c

index 8de45552f6..f2d2856e03 100644

--- a/src/journal/journald-server.c

+++ b/src/journal/journald-server.c

@@ -1041,7 +1041,8 @@ int server_flush_to_var(Server *s, bool require_flag_file) {

         r = 0;

 finish:

-        journal_file_post_change(s->system_journal);

+        if (s->system_journal)

+                journal_file_post_change(s->system_journal);

         s->runtime_journal = journal_file_close(s->runtime_journal);