From 32324f829f8541c3b45b2281a0711264748c6e4b Mon Sep 17 00:00:00 2001 From: Michal Schmidt Date: Fri, 31 Oct 2014 22:07:09 +0100 Subject: [PATCH] Fix ordering cycles involving systemd-journal-flush.service and remote-fs.target (#1159117) --- ...r-journal-flushing-afte-remote-fs.ta.patch | 35 +++++++++++++++++++ systemd.spec | 8 ++++- 2 files changed, 42 insertions(+), 1 deletion(-) create mode 100644 0001-units-don-t-order-journal-flushing-afte-remote-fs.ta.patch diff --git a/0001-units-don-t-order-journal-flushing-afte-remote-fs.ta.patch b/0001-units-don-t-order-journal-flushing-afte-remote-fs.ta.patch new file mode 100644 index 0000000..f43d4d5 --- /dev/null +++ b/0001-units-don-t-order-journal-flushing-afte-remote-fs.ta.patch @@ -0,0 +1,35 @@ +From 267edb57a744028055f0fc4f8dbd0d691e6324ed Mon Sep 17 00:00:00 2001 +From: Lennart Poettering +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 + diff --git a/systemd.spec b/systemd.spec index 84087ff..3dc672f 100644 --- a/systemd.spec +++ b/systemd.spec @@ -16,7 +16,7 @@ Name: systemd Url: http://www.freedesktop.org/wiki/Software/systemd Version: 217 -Release: 1%{?gitcommit:.git%{gitcommit}}%{?dist} +Release: 2%{?gitcommit:.git%{gitcommit}}%{?dist} # For a breakdown of the licensing, see README License: LGPLv2+ and MIT and GPLv2+ 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 # 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 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 %changelog +* Fri Oct 31 2014 Michal Schmidt - 217-2 +- Fix ordering cycles involving systemd-journal-flush.service and + remote-fs.target (#1159117) + * Tue Oct 28 2014 Lennart Poettering - 217-1 - New upstream release