36 lines
1.3 KiB
Diff
36 lines
1.3 KiB
Diff
|
From 267edb57a744028055f0fc4f8dbd0d691e6324ed 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.
|
||
|
|
|
||
|
|
[ Picked from upstream commit 919699ec301ea507edce4a619141ed22e789ac0d.
|
||
|
|
The upstream commit contains unrelated changes in nspawn by mistake.
|
||
|
|
They've been stripped in this backport. -- mschmidt ]
|
||
|
|
---
|
||
|
|
units/systemd-journal-flush.service.in | 3 ++-
|
||
|
|
1 file changed, 2 insertions(+), 1 deletion(-)
|
||
|
|
|
||
|
|
diff --git a/units/systemd-journal-flush.service.in b/units/systemd-journal-flush.service.in
|
||
|
|
index 699670b..2612220 100644
|
||
|
|
--- a/units/systemd-journal-flush.service.in
|
||
|
|
+++ b/units/systemd-journal-flush.service.in
|
||
|
|
@@ -10,8 +10,9 @@ Description=Trigger Flushing of Journal to Persistent Storage
|
||
|
|
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
|
||
|
|
+After=systemd-journald.service
|
||
|
|
Before=systemd-user-sessions.service systemd-tmpfiles-setup.service
|
||
|
|
+RequiresMountsFor=/var/log/journal
|
||
|
|
|
||
|
|
[Service]
|
||
|
|
ExecStart=@rootbindir@/journalctl --flush
|
||
|
|
--
|
||
|
|
2.1.0
|
||
|
|
|