From: Mike Yuan <me@yhndnzj.com>
Date: Wed, 30 Apr 2025 19:23:19 +0000 (+0200)
Subject: units: enable RemoveOnStop= for oomd and userdbd sockets
X-Git-Tag: v258-rc1~695^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F37309%2Fhead;p=thirdparty%2Fsystemd.git

units: enable RemoveOnStop= for oomd and userdbd sockets

We usually don't care, but here the existence of socket
is public API to a certain degree and signals availability
of the service (userdbd in particular, oomd is checked in
core-varlink.c). Hence let's be more careful and remove them
if stopped.
---

diff --git a/units/systemd-oomd.socket b/units/systemd-oomd.socket
index 0002a95bab0..4e24342f581 100644
--- a/units/systemd-oomd.socket
+++ b/units/systemd-oomd.socket
@@ -21,6 +21,7 @@ ConditionPathExists=/proc/pressure/memory
 [Socket]
 ListenStream=/run/systemd/oom/io.systemd.ManagedOOM
 SocketMode=0666
+RemoveOnStop=yes
 
 [Install]
 WantedBy=sockets.target
diff --git a/units/systemd-userdbd.socket b/units/systemd-userdbd.socket
index 768253a2b04..6ef1adeca74 100644
--- a/units/systemd-userdbd.socket
+++ b/units/systemd-userdbd.socket
@@ -17,6 +17,7 @@ Before=sockets.target
 ListenStream=/run/systemd/userdb/io.systemd.Multiplexer
 Symlinks=/run/systemd/userdb/io.systemd.NameServiceSwitch /run/systemd/userdb/io.systemd.DropIn
 SocketMode=0666
+RemoveOnStop=yes
 
 [Install]
 WantedBy=sockets.target