From a2b34106e7a6ae3b721257fb714a05e2f6cbd5dc Mon Sep 17 00:00:00 2001 From: Mike Yuan Date: Sun, 18 May 2025 02:24:38 +0200 Subject: [PATCH] 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. --- units/systemd-journald-audit.socket | 1 + units/systemd-journald-dev-log.socket | 1 + units/systemd-journald.socket | 1 + units/systemd-udevd-control.socket | 1 + units/systemd-udevd-kernel.socket | 1 + units/systemd-udevd-varlink.socket | 1 + 6 files changed, 6 insertions(+) diff --git a/units/systemd-journald-audit.socket b/units/systemd-journald-audit.socket index cf9b6e8b84d..d0b43c7f423 100644 --- 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 e2a9352719d..aa2a4060959 100644 --- 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 e2ffb96bfc6..7b49d43ee80 100644 --- 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 89304ab65aa..942f6a5e8bd 100644 --- 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 d337b06ea0d..b185716aae9 100644 --- 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 94fee15b082..74353e7f1ae 100644 --- 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 -- 2.47.3