29 lines
985 B
Diff
29 lines
985 B
Diff
|
From 33aa231f5bf3335cdacfb38ffba757865019ce4d 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)
|
||
|
|
|
||
|
|
Resolves: #1763619
|
||
|
|
---
|
||
|
|
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 0c983e102a..6aecb67d6c 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);
|
||
|
|
|