SymbX/systemd
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

units: two tweaks for socket units (#37309)

Browse Source
This commit is contained in:
Mike Yuan
2025-05-05 15:13:00 +02:00
committed by GitHub
parent a2bd93c2e8 fd66dc60a0
commit 0777e64ea2
10 changed files with 13 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
units/systemd-importd.service.in
-1
View File
@@ -12,7 +12,6 @@ Description=Disk Image Download Service
Documentation=man:systemd-importd.service(8)
Documentation=man:org.freedesktop.import1(5)
DefaultDependencies=no
After=systemd-importd.socket
WantsMountsFor=/var/lib/machines /var/lib/portables /var/lib/extensions /var/lib/confexts
After=systemd-remount-fs.service
Before=shutdown.target
units/systemd-machined.service.in
+2 -2
View File
@@ -12,8 +12,8 @@ Description=Virtual Machine and Container Registration Service
Documentation=man:systemd-machined.service(8)
Documentation=man:org.freedesktop.machine1(5)
Wants=machine.slice systemd-machined.socket
After=machine.slice systemd-machined.socket
Wants=machine.slice
After=machine.slice
RequiresMountsFor=/var/lib/machines
[Service]
units/systemd-mountfsd.service.in
+1 -1
View File
@@ -12,7 +12,7 @@ Description=DDI File System Mounter
Documentation=man:systemd-mountfsd.service(8)
Wants=modprobe@loop.service modprobe@dm_mod.service
Requires=systemd-mountfsd.socket
After=systemd-mountfsd.socket modprobe@loop.service modprobe@dm_mod.service
After=modprobe@loop.service modprobe@dm_mod.service
Conflicts=shutdown.target
Before=sysinit.target shutdown.target
DefaultDependencies=no
units/systemd-networkd.service.in
+3 -2
View File
@@ -14,10 +14,10 @@ Documentation=man:org.freedesktop.network1(5)
ConditionCapability=CAP_NET_ADMIN
DefaultDependencies=no
# systemd-udevd.service can be dropped once tuntap is moved to netlink
After=systemd-networkd.socket systemd-udevd.service network-pre.target systemd-sysusers.service systemd-sysctl.service
After=systemd-udevd.service network-pre.target systemd-sysusers.service systemd-sysctl.service
Before=network.target multi-user.target shutdown.target initrd-switch-root.target
Conflicts=shutdown.target initrd-switch-root.target
Wants=systemd-networkd.socket network.target systemd-networkd-persistent-storage.service
Wants=network.target systemd-networkd-persistent-storage.service
[Service]
AmbientCapabilities=CAP_NET_ADMIN CAP_NET_BIND_SERVICE CAP_NET_BROADCAST CAP_NET_RAW CAP_BPF CAP_SYS_ADMIN
@@ -46,6 +46,7 @@ RestrictRealtime=yes
RestrictSUIDSGID=yes
RuntimeDirectory=systemd/netif
RuntimeDirectoryPreserve=yes
Sockets=systemd-networkd.socket
SystemCallArchitectures=native
SystemCallErrorNumber=EPERM
SystemCallFilter=@system-service bpf
units/systemd-nsresourced.service.in
-1
View File
@@ -11,7 +11,6 @@
Description=Namespace Resource Manager
Documentation=man:systemd-nsresourced.service(8)
Requires=systemd-nsresourced.socket
After=systemd-nsresourced.socket
Conflicts=shutdown.target
Before=sysinit.target shutdown.target
DefaultDependencies=no
units/systemd-oomd.service.in
+2 -1
View File
@@ -20,7 +20,7 @@ ConditionPathExists=/proc/pressure/cpu
ConditionPathExists=/proc/pressure/io
ConditionPathExists=/proc/pressure/memory
Requires=systemd-oomd.socket
After=systemd-oomd.socket systemd-sysusers.service
After=systemd-sysusers.service
[Service]
AmbientCapabilities=CAP_KILL CAP_DAC_OVERRIDE
@@ -60,3 +60,4 @@ User=systemd-oom
[Install]
WantedBy=multi-user.target
Alias=dbus-org.freedesktop.oom1.service
Also=systemd-oomd.socket
units/systemd-oomd.socket
+1
View File
@@ -21,6 +21,7 @@ ConditionPathExists=/proc/pressure/memory
[Socket]
ListenStream=/run/systemd/oom/io.systemd.ManagedOOM
SocketMode=0666
RemoveOnStop=yes
[Install]
WantedBy=sockets.target
units/systemd-resolved.service.in
+3 -2
View File
@@ -15,10 +15,10 @@ Documentation=https://systemd.io/WRITING_NETWORK_CONFIGURATION_MANAGERS
Documentation=https://systemd.io/WRITING_RESOLVER_CLIENTS
DefaultDependencies=no
After=systemd-sysctl.service systemd-sysusers.service systemd-resolved-varlink.socket systemd-resolved-monitor.socket
After=systemd-sysctl.service systemd-sysusers.service
Before=sysinit.target network.target nss-lookup.target shutdown.target initrd-switch-root.target
Conflicts=shutdown.target initrd-switch-root.target
Wants=nss-lookup.target systemd-resolved-varlink.socket systemd-resolved-monitor.socket
Wants=nss-lookup.target
[Service]
AmbientCapabilities=CAP_SETPCAP CAP_NET_RAW CAP_NET_BIND_SERVICE
@@ -45,6 +45,7 @@ RestrictRealtime=yes
RestrictSUIDSGID=yes
RuntimeDirectory=systemd/resolve
RuntimeDirectoryPreserve=yes
Sockets=systemd-resolved-varlink.socket systemd-resolved-monitor.socket
SystemCallArchitectures=native
SystemCallErrorNumber=EPERM
SystemCallFilter=@system-service
units/systemd-userdbd.service.in
-1
View File
@@ -11,7 +11,6 @@
Description=User Database Manager
Documentation=man:systemd-userdbd.service(8)
Requires=systemd-userdbd.socket
After=systemd-userdbd.socket
Before=sysinit.target
Wants=systemd-userdb-load-credentials.service
DefaultDependencies=no
units/systemd-userdbd.socket
+1
View File
@@ -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