units/systemd-{udevd,journald}*.socket: enable DeferTrigger=

Refer to d766c75acdd825abe1bcfd45406ae2e609a008b6 for the rationale
behind the udevd change.

systemd-journald.service conflicts with soft-reboot.target,
so make sure anything surviving soft-reboot and trying
to log to journal doesn't fail the socket units.

diff --git a/units/systemd-journald-audit.socket b/units/systemd-journald-audit.socket
index cf9b6e8b84d680e50e67b2332ae286fe4c996c03..d0b43c7f423c93769efff168a1f41fe575e1895b 100644 (file)
--- a/units/systemd-journald-audit.socket
+++ b/units/systemd-journald-audit.socket
@@ -20,6 +20,7 @@ Service=systemd-journald.service
 ReceiveBuffer=128M
 ListenNetlink=audit 1
 PassCredentials=yes
+DeferTrigger=yes
 
 [Install]
 WantedBy=sockets.target

diff --git a/units/systemd-journald-dev-log.socket b/units/systemd-journald-dev-log.socket
index e2a9352719d9d850b1773ac14a6ab4209b683af3..aa2a40609598553ae4e913efb6352f8d5eb351b8 100644 (file)
--- a/units/systemd-journald-dev-log.socket
+++ b/units/systemd-journald-dev-log.socket
@@ -26,6 +26,7 @@ Service=systemd-journald.service
 SocketMode=0666
 Symlinks=/dev/log
 Timestamping=us
+DeferTrigger=yes
 
 # Increase both the send and receive buffer, so that things don't
 # block early. Note that journald internally uses the this socket both

diff --git a/units/systemd-journald.socket b/units/systemd-journald.socket
index e2ffb96bfc62468519bb7c10f4d867f5b79c41eb..7b49d43ee8063ea82e1e4622de4fafc4fc89b5da 100644 (file)
--- a/units/systemd-journald.socket
+++ b/units/systemd-journald.socket
@@ -27,3 +27,4 @@ ReceiveBuffer=8M
 Service=systemd-journald.service
 SocketMode=0666
 Timestamping=us
+DeferTrigger=yes

diff --git a/units/systemd-udevd-control.socket b/units/systemd-udevd-control.socket
index 89304ab65aa715eff085432cb33e13b101851d88..942f6a5e8bd547d1fd9874d2860d2c234145b6fd 100644 (file)
--- a/units/systemd-udevd-control.socket
+++ b/units/systemd-udevd-control.socket
@@ -20,3 +20,4 @@ ListenSequentialPacket=/run/udev/control
 SocketMode=0600
 PassCredentials=yes
 RemoveOnStop=yes
+DeferTrigger=yes

diff --git a/units/systemd-udevd-kernel.socket b/units/systemd-udevd-kernel.socket
index d337b06ea0d353d1215efff4ad56a6ccd4b9e499..b185716aae95121917fefa72f77f903d3e5f742b 100644 (file)
--- a/units/systemd-udevd-kernel.socket
+++ b/units/systemd-udevd-kernel.socket
@@ -24,3 +24,4 @@ Service=systemd-udevd.service
 ReceiveBuffer=128M
 ListenNetlink=kobject-uevent 1
 PassCredentials=yes
+DeferTrigger=yes

diff --git a/units/systemd-udevd-varlink.socket b/units/systemd-udevd-varlink.socket
index 94fee15b0828750e1b5af52a54a4c4769f1deea4..74353e7f1aec66c0db50961597f9a76914948264 100644 (file)
--- a/units/systemd-udevd-varlink.socket
+++ b/units/systemd-udevd-varlink.socket
@@ -20,3 +20,4 @@ ListenStream=/run/udev/io.systemd.Udev
 FileDescriptorName=varlink
 SocketMode=0600
 RemoveOnStop=yes
+DeferTrigger=yes