anitazha / rpms / systemd

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