[systemd-commits] 2 commits - units/basic.target units/systemd-journal-flush.service.in units/timers.target

[Zbigniew Jędrzejewski-Szmek]

 units/basic.target                     |    5 ++++-
 units/systemd-journal-flush.service.in |    1 +
 units/timers.target                    |    3 +++
 3 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit 1f1926aa5e836caa3bd6df43704aecd606135103
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date:   Sun Nov 2 21:45:42 2014 -0500

    units: order sd-journal-flush after sd-remount-fs
    
    Otherwise we could attempt to flush the journal while /var/log/ was
    still ro, and silently skip journal flushing.
    
    The way that errors in flushing are handled should still be changed to
    be more transparent and robust.

diff --git a/units/systemd-journal-flush.service.in b/units/systemd-journal-flush.service.in
index fa29089..98c91b4 100644
--- a/units/systemd-journal-flush.service.in
+++ b/units/systemd-journal-flush.service.in
@@ -11,6 +11,7 @@ Documentation=man:systemd-journald.service(8) man:journald.conf(5)
 DefaultDependencies=no
 Requires=systemd-journald.service
 After=systemd-journald.service
+After=systemd-remount-fs.service
 Before=systemd-user-sessions.service systemd-tmpfiles-setup.service
 RequiresMountsFor=/var/log/journal
 

commit 3b0217036040a6013faeab4eb9da7469e3bbcfb3
Author: Zbigniew Jędrzejewski-Szmek <zbyszek at in.waw.pl>
Date:   Sun Nov 2 11:39:17 2014 -0500

    unit: do not order timers.target before basic.target
    
    Since commit 19f8d037833f2 'timer: order OnCalendar units after
    timer-sync.target if DefaultDependencies=no' timers might get a
    dependency on time-sync.target, which does not really belong in early
    boot. If ntp is enabled, time-sync.target might be delayed until a
    network connection is established.
    
    It turns out that majority of timer units found in the wild do not
    need to be started in early boot. Out of the timer units available in
    Fedora 21, only systemd-readahead-done.timer and mdadm-last-resort at .timer
    should be started early, but they both have DefaultDependencies=no,
    so are not part of timers.target anyway. All the rest look like they
    will be fine with being started a bit later (and the majority even
    much later, since they run daily or weekly).
    
    Let timers.target be pulled in by basic.target, but without the
    temporal dependency. This means timer units are started on a "best
    effort" schedule.
    
    https://bugzilla.redhat.com/show_bug.cgi?id=1158206

diff --git a/units/basic.target b/units/basic.target
index 228f62c..eee3e6b 100644
--- a/units/basic.target
+++ b/units/basic.target
@@ -8,8 +8,11 @@
 [Unit]
 Description=Basic System
 Documentation=man:systemd.special(7)
+
 Requires=sysinit.target
+After=sysinit.target
 Wants=sockets.target timers.target paths.target slices.target
-After=sysinit.target sockets.target timers.target paths.target slices.target
+After=sockets.target paths.target slices.target
+
 JobTimeoutSec=15min
 JobTimeoutAction=poweroff-force
diff --git a/units/timers.target b/units/timers.target
index 07fda3d..251fa68 100644
--- a/units/timers.target
+++ b/units/timers.target
@@ -8,3 +8,6 @@
 [Unit]
 Description=Timers
 Documentation=man:systemd.special(7)
+
+DefaultDependencies=no
+Conflicts=shutdown.target