Magellan Linux

Contents of /trunk/systemd/patches/systemd-217-units-don-t-order-journal-flushing-afte-remote-fs.ta.patch

Parent Directory Parent Directory | Revision Log Revision Log


Revision 2524 - (show annotations) (download)
Mon Nov 17 13:56:31 2014 UTC (9 years, 5 months ago) by niro
File size: 1169 byte(s)
-upstream fixes
1 From 919699ec301ea507edce4a619141ed22e789ac0d Mon Sep 17 00:00:00 2001
2 From: Lennart Poettering <lennart@poettering.net>
3 Date: Fri, 31 Oct 2014 16:22:36 +0100
4 Subject: [PATCH] units: don't order journal flushing afte remote-fs.target
5
6 Instead, only depend on the actual file systems we need.
7
8 This should solve dep loops on setups where remote-fs.target is moved
9 into late boot.
10 ---
11 units/systemd-journal-flush.service.in | 3 ++-
12 1 file changed, 2 insertions(+), 1 deletion(-)
13
14 diff --git a/units/systemd-journal-flush.service.in b/units/systemd-journal-flush.service.in
15 index 699670b..2612220 100644
16 --- a/units/systemd-journal-flush.service.in
17 +++ b/units/systemd-journal-flush.service.in
18 @@ -10,8 +10,9 @@ Description=Trigger Flushing of Journal to Persistent Storage
19 Documentation=man:systemd-journald.service(8) man:journald.conf(5)
20 DefaultDependencies=no
21 Requires=systemd-journald.service
22 -After=systemd-journald.service local-fs.target remote-fs.target
23 +After=systemd-journald.service
24 Before=systemd-user-sessions.service systemd-tmpfiles-setup.service
25 +RequiresMountsFor=/var/log/journal
26
27 [Service]
28 ExecStart=@rootbindir@/journalctl --flush
29 --
30 2.1.3
31