Fix ordering cycles involving systemd-journal-flush.service and remote-fs.target (#1159117)

This commit is contained in:
Michal Schmidt 2014-10-31 22:07:09 +01:00
parent c6e31c698a
commit 32324f829f
2 changed files with 42 additions and 1 deletions

View File

@ -0,0 +1,35 @@
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

View File

@ -16,7 +16,7 @@
Name: systemd Name: systemd
Url: http://www.freedesktop.org/wiki/Software/systemd Url: http://www.freedesktop.org/wiki/Software/systemd
Version: 217 Version: 217
Release: 1%{?gitcommit:.git%{gitcommit}}%{?dist} Release: 2%{?gitcommit:.git%{gitcommit}}%{?dist}
# For a breakdown of the licensing, see README # For a breakdown of the licensing, see README
License: LGPLv2+ and MIT and GPLv2+ License: LGPLv2+ and MIT and GPLv2+
Summary: A System and Service Manager Summary: A System and Service Manager
@ -40,6 +40,8 @@ Source6: sysctl.conf.README
# GIT_DIR=~/src/systemd/.git git format-patch-ab -M -N --no-signature v216..master # GIT_DIR=~/src/systemd/.git git format-patch-ab -M -N --no-signature v216..master
# i=1; for p in 0*patch;do printf "Patch%04d: %s\n" $i $p; ((i++));done # i=1; for p in 0*patch;do printf "Patch%04d: %s\n" $i $p; ((i++));done
Patch0001: 0001-units-don-t-order-journal-flushing-afte-remote-fs.ta.patch
Patch0998: fedora-disable-resolv.conf-symlink.patch Patch0998: fedora-disable-resolv.conf-symlink.patch
Patch0999: fedora-add-bridge-sysctl-configuration.patch Patch0999: fedora-add-bridge-sysctl-configuration.patch
@ -822,6 +824,10 @@ getent passwd systemd-journal-upload >/dev/null 2>&1 || useradd -r -l -g systemd
%{_datadir}/systemd/gatewayd %{_datadir}/systemd/gatewayd
%changelog %changelog
* Fri Oct 31 2014 Michal Schmidt <mschmidt@redhat.com> - 217-2
- Fix ordering cycles involving systemd-journal-flush.service and
remote-fs.target (#1159117)
* Tue Oct 28 2014 Lennart Poettering <lpoetter@redhat.com> - 217-1 * Tue Oct 28 2014 Lennart Poettering <lpoetter@redhat.com> - 217-1
- New upstream release - New upstream release