forked from pool/systemd
39 lines
1.6 KiB
Diff
39 lines
1.6 KiB
Diff
|
Based on 1f1926aa5e836caa3bd6df43704aecd606135103 Mon Sep 17 00:00:00 2001
|
||
|
|
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
|
||
|
|
Date: Sun, 2 Nov 2014 21:45:42 -0500
|
||
|
|
Subject: [PATCH] units: order sd-journal-flush after sd-remount-fs
|
||
|
|
|
||
|
|
Otherwise we could attempt to flush the journal while /var/log/ was
|
||
|
|
still ro, and silently skip journal flushing.
|
||
|
|
|
||
|
|
The way that errors in flushing are handled should still be changed to
|
||
|
|
be more transparent and robust.
|
||
|
|
|
||
|
|
Based on 919699ec301ea507edce4a619141ed22e789ac0d Mon Sep 17 00:00:00 2001
|
||
|
|
From: Lennart Poettering <lennart@poettering.net>
|
||
|
|
Date: Fri, 31 Oct 2014 16:22:36 +0100
|
||
|
|
Subject: [PATCH] units: don't order journal flushing afte remote-fs.target
|
||
|
|
|
||
|
|
Instead, only depend on the actual file systems we need.
|
||
|
|
|
||
|
|
This should solve dep loops on setups where remote-fs.target is moved
|
||
|
|
into late boot.
|
||
|
|
---
|
||
|
|
units/systemd-journal-flush.service.in | 5 +++--
|
||
|
|
1 file changed, 3 insertions(+), 2 deletions(-)
|
||
|
|
|
||
|
|
--- units/systemd-journal-flush.service.in
|
||
|
|
+++ units/systemd-journal-flush.service.in 2014-11-10 11:46:22.885518923 +0000
|
||
|
|
@@ -10,8 +10,9 @@ Description=Trigger Flushing of Journal
|
||
|
|
Documentation=man:systemd-journald.service(8) man:journald.conf(5)
|
||
|
|
DefaultDependencies=no
|
||
|
|
Requires=systemd-journald.service
|
||
|
|
-After=systemd-journald.service local-fs.target remote-fs.target
|
||
|
|
-Before=systemd-user-sessions.service
|
||
|
|
+After=systemd-journald.service local-fs.target
|
||
|
|
+After=systemd-remount-fs.service
|
||
|
|
+Before=systemd-user-sessions.service systemd-tmpfiles-setup.service
|
||
|
|
|
||
|
|
[Service]
|
||
|
|
ExecStart=@rootbindir@/systemctl kill --kill-who=main --signal=SIGUSR1 systemd-journald.service
|