anitazha / rpms / systemd

Forked from rpms/systemd 3 years ago
Clone

Blame SOURCES/0696-journald-fixed-assertion-failure-when-system-journal.patch

c62b8e
From 7b82ce4a8457639d225449f3d345138c9f4f5ad9 Mon Sep 17 00:00:00 2001
c62b8e
From: =?UTF-8?q?Renaud=20M=C3=A9trich?=
c62b8e
 <1163635+rmetrich@users.noreply.github.com>
c62b8e
Date: Mon, 3 Sep 2018 05:42:39 +0200
c62b8e
Subject: [PATCH] journald: fixed assertion failure when system journal
c62b8e
 rotation fails (#9893)
c62b8e
c62b8e
(cherry picked from commit fd790d6f09b10a87b007b71403cb018f18ff91c9)
c62b8e
Resolves: #1619543
c62b8e
---
c62b8e
 src/journal/journald-server.c | 3 ++-
c62b8e
 1 file changed, 2 insertions(+), 1 deletion(-)
c62b8e
c62b8e
diff --git a/src/journal/journald-server.c b/src/journal/journald-server.c
c62b8e
index 88d8f3e41d..88cf0b2d53 100644
c62b8e
--- a/src/journal/journald-server.c
c62b8e
+++ b/src/journal/journald-server.c
c62b8e
@@ -1180,7 +1180,8 @@ int server_flush_to_var(Server *s, bool require_flag_file) {
c62b8e
         }
c62b8e
 
c62b8e
 finish:
c62b8e
-        journal_file_post_change(s->system_journal);
c62b8e
+        if (s->system_journal)
c62b8e
+                journal_file_post_change(s->system_journal);
c62b8e
 
c62b8e
         journal_file_close(s->runtime_journal);
c62b8e
         s->runtime_journal = NULL;