ryantimwilson / rpms / systemd

Forked from rpms/systemd a month ago
Clone
Michal Schmidt 32324f
From 267edb57a744028055f0fc4f8dbd0d691e6324ed Mon Sep 17 00:00:00 2001
Michal Schmidt 32324f
From: Lennart Poettering <lennart@poettering.net>
Michal Schmidt 32324f
Date: Fri, 31 Oct 2014 16:22:36 +0100
Michal Schmidt 32324f
Subject: [PATCH] units: don't order journal flushing afte remote-fs.target
Michal Schmidt 32324f
Michal Schmidt 32324f
Instead, only depend on the actual file systems we need.
Michal Schmidt 32324f
Michal Schmidt 32324f
This should solve dep loops on setups where remote-fs.target is moved
Michal Schmidt 32324f
into late boot.
Michal Schmidt 32324f
Michal Schmidt 32324f
[ Picked from upstream commit 919699ec301ea507edce4a619141ed22e789ac0d.
Michal Schmidt 32324f
  The upstream commit contains unrelated changes in nspawn by mistake.
Michal Schmidt 32324f
  They've been stripped in this backport. -- mschmidt ]
Michal Schmidt 32324f
---
Michal Schmidt 32324f
 units/systemd-journal-flush.service.in | 3 ++-
Michal Schmidt 32324f
 1 file changed, 2 insertions(+), 1 deletion(-)
Michal Schmidt 32324f
Michal Schmidt 32324f
diff --git a/units/systemd-journal-flush.service.in b/units/systemd-journal-flush.service.in
Michal Schmidt 32324f
index 699670b..2612220 100644
Michal Schmidt 32324f
--- a/units/systemd-journal-flush.service.in
Michal Schmidt 32324f
+++ b/units/systemd-journal-flush.service.in
Michal Schmidt 32324f
@@ -10,8 +10,9 @@ Description=Trigger Flushing of Journal to Persistent Storage
Michal Schmidt 32324f
 Documentation=man:systemd-journald.service(8) man:journald.conf(5)
Michal Schmidt 32324f
 DefaultDependencies=no
Michal Schmidt 32324f
 Requires=systemd-journald.service
Michal Schmidt 32324f
-After=systemd-journald.service local-fs.target remote-fs.target
Michal Schmidt 32324f
+After=systemd-journald.service
Michal Schmidt 32324f
 Before=systemd-user-sessions.service systemd-tmpfiles-setup.service
Michal Schmidt 32324f
+RequiresMountsFor=/var/log/journal
Michal Schmidt 32324f
 
Michal Schmidt 32324f
 [Service]
Michal Schmidt 32324f
 ExecStart=@rootbindir@/journalctl --flush
Michal Schmidt 32324f
-- 
Michal Schmidt 32324f
2.1.0
Michal Schmidt 32324f