2013-05-07 13:05:28 +01:00
|
|
|
|
From 7a498e661f3d111fa09700a6cfa62cfd6733b1cc Mon Sep 17 00:00:00 2001
|
2013-01-08 15:05:04 +00:00
|
|
|
|
From: Eelco Dolstra <eelco.dolstra@logicblox.com>
|
|
|
|
|
|
Date: Tue, 8 Jan 2013 15:48:19 +0100
|
2013-05-07 13:26:29 +01:00
|
|
|
|
Subject: [PATCH 4/9] Set switch-to-configuration hints for some units
|
2013-01-08 15:05:04 +00:00
|
|
|
|
MIME-Version: 1.0
|
|
|
|
|
|
Content-Type: text/plain; charset=UTF-8
|
|
|
|
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
|
|
|
|
|
|
|
|
Target units like local-fs.target need ‘X-StopOnReconfiguration=yes’
|
|
|
|
|
|
to ensure dependencies *on* that target properly take into account the
|
|
|
|
|
|
dependencies *of* the target.
|
|
|
|
|
|
|
|
|
|
|
|
‘X-RestartIfChanged=no’ is necessary for systemd-journald.service
|
|
|
|
|
|
because restarting it causes services connected to journald to stop
|
|
|
|
|
|
logging.
|
|
|
|
|
|
|
|
|
|
|
|
‘X-RestartIfChanged=no’ is necessary for systemd-user-sessions.service
|
|
|
|
|
|
to prevent all user sessions from being killed when this unit changes.
|
|
|
|
|
|
---
|
|
|
|
|
|
units/local-fs.target | 2 ++
|
|
|
|
|
|
units/remote-fs.target | 2 ++
|
|
|
|
|
|
units/systemd-journald.service.in | 5 +++++
|
|
|
|
|
|
units/systemd-user-sessions.service.in | 3 +++
|
|
|
|
|
|
4 files changed, 12 insertions(+)
|
|
|
|
|
|
|
|
|
|
|
|
diff --git a/units/local-fs.target b/units/local-fs.target
|
2013-04-12 13:31:53 +01:00
|
|
|
|
index 18c3d74..a09054c 100644
|
2013-01-08 15:05:04 +00:00
|
|
|
|
--- a/units/local-fs.target
|
|
|
|
|
|
+++ b/units/local-fs.target
|
2013-03-27 12:58:31 +00:00
|
|
|
|
@@ -11,3 +11,5 @@ Documentation=man:systemd.special(7)
|
|
|
|
|
|
After=local-fs-pre.target
|
2013-01-08 15:05:04 +00:00
|
|
|
|
OnFailure=emergency.target
|
2013-04-12 13:31:53 +01:00
|
|
|
|
OnFailureIsolate=no
|
2013-01-08 15:05:04 +00:00
|
|
|
|
+
|
|
|
|
|
|
+X-StopOnReconfiguration=yes
|
|
|
|
|
|
diff --git a/units/remote-fs.target b/units/remote-fs.target
|
2013-05-07 13:05:28 +01:00
|
|
|
|
index 09213e8..47b4cf5 100644
|
2013-01-08 15:05:04 +00:00
|
|
|
|
--- a/units/remote-fs.target
|
|
|
|
|
|
+++ b/units/remote-fs.target
|
2013-03-27 12:58:31 +00:00
|
|
|
|
@@ -10,5 +10,7 @@ Description=Remote File Systems
|
2013-01-08 15:05:04 +00:00
|
|
|
|
Documentation=man:systemd.special(7)
|
2013-05-07 13:05:28 +01:00
|
|
|
|
After=remote-fs-pre.target
|
2013-01-08 15:05:04 +00:00
|
|
|
|
|
|
|
|
|
|
+X-StopOnReconfiguration=yes
|
|
|
|
|
|
+
|
|
|
|
|
|
[Install]
|
|
|
|
|
|
WantedBy=multi-user.target
|
|
|
|
|
|
diff --git a/units/systemd-journald.service.in b/units/systemd-journald.service.in
|
|
|
|
|
|
index ab2e50c..9563a7d 100644
|
|
|
|
|
|
--- a/units/systemd-journald.service.in
|
|
|
|
|
|
+++ b/units/systemd-journald.service.in
|
|
|
|
|
|
@@ -24,3 +24,8 @@ CapabilityBoundingSet=CAP_SYS_ADMIN CAP_DAC_OVERRIDE CAP_SYS_PTRACE CAP_SYSLOG C
|
|
|
|
|
|
# Increase the default a bit in order to allow many simultaneous
|
|
|
|
|
|
# services being run since we keep one fd open per service.
|
|
|
|
|
|
LimitNOFILE=16384
|
|
|
|
|
|
+
|
|
|
|
|
|
+# Don't restart journald, since that causes services connected to
|
|
|
|
|
|
+# journald to stop logging (see
|
|
|
|
|
|
+# https://bugs.freedesktop.org/show_bug.cgi?id=56043).
|
|
|
|
|
|
+X-RestartIfChanged=no
|
|
|
|
|
|
diff --git a/units/systemd-user-sessions.service.in b/units/systemd-user-sessions.service.in
|
|
|
|
|
|
index 0869e73..b6ed958 100644
|
|
|
|
|
|
--- a/units/systemd-user-sessions.service.in
|
|
|
|
|
|
+++ b/units/systemd-user-sessions.service.in
|
|
|
|
|
|
@@ -15,3 +15,6 @@ Type=oneshot
|
|
|
|
|
|
RemainAfterExit=yes
|
|
|
|
|
|
ExecStart=@rootlibexecdir@/systemd-user-sessions start
|
|
|
|
|
|
ExecStop=@rootlibexecdir@/systemd-user-sessions stop
|
|
|
|
|
|
+
|
|
|
|
|
|
+# Restart kills all active sessions.
|
|
|
|
|
|
+X-RestartIfChanged=no
|
|
|
|
|
|
--
|
2013-05-07 13:05:28 +01:00
|
|
|
|
1.8.2.1
|
2013-01-08 15:05:04 +00:00
|
|
|
|
|
