units: add IgnoreOnIsolate=yes to systemd-journald too

We already had it on the socket units, so it's possible that
systemd-journald.service would be stopped and then restarted when trafic hits
the sockets when something logs. Let's not try to stop it. It is supposed to
run until the end and be eventually killed in the final killing spree.

This might (or not) help with #23287.

diff --git a/units/systemd-journald-dev-log.socket b/units/systemd-journald-dev-log.socket
index 93e8b252b25e744bd812948902a9604b67a2253d..e2a9352719d9d850b1773ac14a6ab4209b683af3 100644 (file)
--- a/units/systemd-journald-dev-log.socket
+++ b/units/systemd-journald-dev-log.socket
@@ -13,9 +13,9 @@ Documentation=man:systemd-journald.service(8) man:journald.conf(5)
 DefaultDependencies=no
 Before=sockets.target
 
-# Mount and swap units need this. If this socket unit is removed by an
-# isolate request the mount and swap units would be removed too,
-# hence let's exclude this from isolate requests.
+# Mount and swap units need this. If this socket unit is removed by an isolate
+# request the mount and swap units would be removed too, hence let's exclude
+# systemd-journald and its sockets from isolate requests.
 IgnoreOnIsolate=yes
 
 [Socket]

diff --git a/units/systemd-journald.service.in b/units/systemd-journald.service.in
index cd17b6b4e7ee6f377ce682e20d2da5693f8a11d5..38ba3e28563ad80c30be46a9f8bd8b839436871b 100644 (file)
--- a/units/systemd-journald.service.in
+++ b/units/systemd-journald.service.in
@@ -15,6 +15,11 @@ Requires=systemd-journald.socket
 After=systemd-journald.socket systemd-journald-dev-log.socket systemd-journald-audit.socket syslog.socket
 Before=sysinit.target
 
+# Mount and swap units need the journal socket units. If they were removed by
+# an isolate request the mount and swap units would be removed too, hence let's
+# exclude systemd-journald and its sockets from isolate requests.
+IgnoreOnIsolate=yes
+
 [Service]
 DeviceAllow=char-* rw
 ExecStart={{ROOTLIBEXECDIR}}/systemd-journald

diff --git a/units/systemd-journald.socket b/units/systemd-journald.socket
index ada3520ad15db8cf296392194ed4f6804d0c2df5..1e2178e8fdf784d8305ecde53585ffc401f88183 100644 (file)
--- a/units/systemd-journald.socket
+++ b/units/systemd-journald.socket
@@ -13,9 +13,9 @@ Documentation=man:systemd-journald.service(8) man:journald.conf(5)
 DefaultDependencies=no
 Before=sockets.target
 
-# Mount and swap units need this. If this socket unit is removed by an
-# isolate request the mount and swap units would be removed too,
-# hence let's exclude this from isolate requests.
+# Mount and swap units need this. If this socket unit is removed by an isolate
+# request the mount and swap units would be removed too, hence let's exclude
+# systemd-journald and its sockets from isolate requests.
 IgnoreOnIsolate=yes
 
 [Socket]