|
Zbigniew Jędrzejewski-Szmek |
405356 |
From 3c6a000d5c291f998dba2eb4c8e351f4603ca985 Mon Sep 17 00:00:00 2001
|
|
Zbigniew Jędrzejewski-Szmek |
405356 |
From: =?UTF-8?q?Zbigniew=20J=C4=99drzejewski-Szmek?= <zbyszek@in.waw.pl>
|
|
Zbigniew Jędrzejewski-Szmek |
405356 |
Date: Sun, 2 Nov 2014 11:39:17 -0500
|
|
Zbigniew Jędrzejewski-Szmek |
405356 |
Subject: [PATCH] unit: do not order timers.target before basic.target
|
|
Zbigniew Jędrzejewski-Szmek |
405356 |
|
|
Zbigniew Jędrzejewski-Szmek |
405356 |
Since commit 19f8d037833f2 'timer: order OnCalendar units after
|
|
Zbigniew Jędrzejewski-Szmek |
405356 |
timer-sync.target if DefaultDependencies=no' timers might get a
|
|
Zbigniew Jędrzejewski-Szmek |
405356 |
dependency on time-sync.target, which does not really belong in early
|
|
Zbigniew Jędrzejewski-Szmek |
405356 |
boot. If ntp is enabled, time-sync.target might be delayed until a
|
|
Zbigniew Jędrzejewski-Szmek |
405356 |
network connection is established.
|
|
Zbigniew Jędrzejewski-Szmek |
405356 |
|
|
Zbigniew Jędrzejewski-Szmek |
405356 |
It turns out that majority of timer units found in the wild do not
|
|
Zbigniew Jędrzejewski-Szmek |
405356 |
need to be started in early boot. Out of the timer units available in
|
|
Zbigniew Jędrzejewski-Szmek |
405356 |
Fedora 21, only systemd-readahead-done.timer and mdadm-last-resort@.timer
|
|
Zbigniew Jędrzejewski-Szmek |
405356 |
should be started early, but they both have DefaultDependencies=no,
|
|
Zbigniew Jędrzejewski-Szmek |
405356 |
so are not part of timers.target anyway. All the rest look like they
|
|
Zbigniew Jędrzejewski-Szmek |
405356 |
will be fine with being started a bit later (and the majority even
|
|
Zbigniew Jędrzejewski-Szmek |
405356 |
much later, since they run daily or weekly).
|
|
Zbigniew Jędrzejewski-Szmek |
405356 |
|
|
Zbigniew Jędrzejewski-Szmek |
405356 |
Let timers.target be pulled in by basic.target, but without the
|
|
Zbigniew Jędrzejewski-Szmek |
405356 |
temporal dependency. This means timer units are started on a "best
|
|
Zbigniew Jędrzejewski-Szmek |
405356 |
effort" schedule.
|
|
Zbigniew Jędrzejewski-Szmek |
405356 |
|
|
Zbigniew Jędrzejewski-Szmek |
405356 |
https://bugzilla.redhat.com/show_bug.cgi?id=1158206
|
|
Zbigniew Jędrzejewski-Szmek |
405356 |
(cherry picked from commit 3b0217036040a6013faeab4eb9da7469e3bbcfb3)
|
|
Zbigniew Jędrzejewski-Szmek |
405356 |
|
|
Zbigniew Jędrzejewski-Szmek |
405356 |
Conflicts:
|
|
Zbigniew Jędrzejewski-Szmek |
405356 |
units/basic.target
|
|
Zbigniew Jędrzejewski-Szmek |
405356 |
---
|
|
Zbigniew Jędrzejewski-Szmek |
405356 |
units/basic.target | 4 +++-
|
|
Zbigniew Jędrzejewski-Szmek |
405356 |
units/timers.target | 3 +++
|
|
Zbigniew Jędrzejewski-Szmek |
405356 |
2 files changed, 6 insertions(+), 1 deletion(-)
|
|
Zbigniew Jędrzejewski-Szmek |
405356 |
|
|
Zbigniew Jędrzejewski-Szmek |
405356 |
diff --git a/units/basic.target b/units/basic.target
|
|
Zbigniew Jędrzejewski-Szmek |
405356 |
index b890d48bbc..abb63ec560 100644
|
|
Zbigniew Jędrzejewski-Szmek |
405356 |
--- a/units/basic.target
|
|
Zbigniew Jędrzejewski-Szmek |
405356 |
+++ b/units/basic.target
|
|
Zbigniew Jędrzejewski-Szmek |
405356 |
@@ -8,6 +8,8 @@
|
|
Zbigniew Jędrzejewski-Szmek |
405356 |
[Unit]
|
|
Zbigniew Jędrzejewski-Szmek |
405356 |
Description=Basic System
|
|
Zbigniew Jędrzejewski-Szmek |
405356 |
Documentation=man:systemd.special(7)
|
|
Zbigniew Jędrzejewski-Szmek |
405356 |
+
|
|
Zbigniew Jędrzejewski-Szmek |
405356 |
Requires=sysinit.target
|
|
Zbigniew Jędrzejewski-Szmek |
405356 |
+After=sysinit.target
|
|
Zbigniew Jędrzejewski-Szmek |
405356 |
Wants=sockets.target timers.target paths.target slices.target
|
|
Zbigniew Jędrzejewski-Szmek |
405356 |
-After=sysinit.target sockets.target timers.target paths.target slices.target
|
|
Zbigniew Jędrzejewski-Szmek |
405356 |
+After=sockets.target paths.target slices.target
|
|
Zbigniew Jędrzejewski-Szmek |
405356 |
diff --git a/units/timers.target b/units/timers.target
|
|
Zbigniew Jędrzejewski-Szmek |
405356 |
index 07fda3d9d0..251fa68065 100644
|
|
Zbigniew Jędrzejewski-Szmek |
405356 |
--- a/units/timers.target
|
|
Zbigniew Jędrzejewski-Szmek |
405356 |
+++ b/units/timers.target
|
|
Zbigniew Jędrzejewski-Szmek |
405356 |
@@ -8,3 +8,6 @@
|
|
Zbigniew Jędrzejewski-Szmek |
405356 |
[Unit]
|
|
Zbigniew Jędrzejewski-Szmek |
405356 |
Description=Timers
|
|
Zbigniew Jędrzejewski-Szmek |
405356 |
Documentation=man:systemd.special(7)
|
|
Zbigniew Jędrzejewski-Szmek |
405356 |
+
|
|
Zbigniew Jędrzejewski-Szmek |
405356 |
+DefaultDependencies=no
|
|
Zbigniew Jędrzejewski-Szmek |
405356 |
+Conflicts=shutdown.target
|