Date: Tuesday, November 4, 2014 @ 13:58:29 Author: dreisner Revision: 225607
upgpkg: systemd 217-3 - backport fix for ordering loop with journal flush (FS#42633) Added: systemd/trunk/0001-units-don-t-order-journal-flushing-afte-remote-fs.ta.patch Modified: systemd/trunk/PKGBUILD -----------------------------------------------------------------+ 0001-units-don-t-order-journal-flushing-afte-remote-fs.ta.patch | 31 ++++++++++ PKGBUILD | 3 2 files changed, 34 insertions(+) Added: 0001-units-don-t-order-journal-flushing-afte-remote-fs.ta.patch =================================================================== --- 0001-units-don-t-order-journal-flushing-afte-remote-fs.ta.patch (rev 0) +++ 0001-units-don-t-order-journal-flushing-afte-remote-fs.ta.patch 2014-11-04 12:58:29 UTC (rev 225607) @@ -0,0 +1,31 @@ +From 919699ec301ea507edce4a619141ed22e789ac0d Mon Sep 17 00:00:00 2001 +From: Lennart Poettering <lenn...@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. +--- + 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.3 + Modified: PKGBUILD =================================================================== --- PKGBUILD 2014-11-04 11:17:26 UTC (rev 225606) +++ PKGBUILD 2014-11-04 12:58:29 UTC (rev 225607) @@ -17,6 +17,7 @@ '0001-sd-dhcp-client-clean-up-raw-socket-sd_event_source-w.patch' '0001-shared-install-avoid-prematurely-rejecting-missing-u.patch' '0001-sd-bus-properly-handle-removals-of-non-existing-matc.patch' + '0001-units-don-t-order-journal-flushing-afte-remote-fs.ta.patch' 'initcpio-hook-udev' 'initcpio-install-systemd' 'initcpio-install-udev') @@ -25,6 +26,7 @@ 'ade8c1b5b2c85d0a83b7bcf5aa6d131a' '7aaf44ce842deb449fca0f2595bbc1e4' '4adc3ddce027693bafa53089322e859b' + '42ff9d59bb057637355b202157d59991' '29245f7a240bfba66e2b1783b63b6b40' '455b68a9a15f634dcfdaff2463010d4e' 'bde43090d4ac0ef048e3eaee8202a407') @@ -37,6 +39,7 @@ patch -Np1 <../0001-sd-dhcp-client-clean-up-raw-socket-sd_event_source-w.patch patch -Np1 <../0001-shared-install-avoid-prematurely-rejecting-missing-u.patch patch -Np1 <../0001-sd-bus-properly-handle-removals-of-non-existing-matc.patch + patch -Np1 <../0001-units-don-t-order-journal-flushing-afte-remote-fs.ta.patch } build() {