units: unify deps between service and socket units

The current arrangement of service and socket units is
sort of all over the place. Let's clean it up a little,
roughly following the principles below:

- socket units have implicit ordering deps (not to be confused
  with default ones which are subject to DefaultDependencies=)
  before associated service, so drop any explicit After=

- If socket can be enabled, remember to link to it in service
  via Also= and Sockets= (the latter replaces Wants=).
  If the service Requires= socket however, Sockets= is omitted.

- If socket is statically enabled, no need for service
  to pull it in - machined

diff --git a/units/systemd-importd.service.in b/units/systemd-importd.service.in
index e119d4092924e31e0d6e5c9270a3252995d68ee5..e7a40f2057390f49897ce0964f2611fbbb97bf06 100644 (file)
--- a/units/systemd-importd.service.in
+++ b/units/systemd-importd.service.in
@@ -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

diff --git a/units/systemd-machined.service.in b/units/systemd-machined.service.in
index 7f70c87e80e7aa568abb2f56f448f6aeb07d1413..47aa5deeedc5f4399b970a91a54f7f58bb44b8bc 100644 (file)
--- a/units/systemd-machined.service.in
+++ b/units/systemd-machined.service.in
@@ -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]

diff --git a/units/systemd-mountfsd.service.in b/units/systemd-mountfsd.service.in
index 00a0827fbcd1e0e55d8fb63cc927e607c92e830e..381408da9ccb36e962df3e1d2c40a6b2dec72c19 100644 (file)
--- a/units/systemd-mountfsd.service.in
+++ b/units/systemd-mountfsd.service.in
@@ -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

diff --git a/units/systemd-networkd.service.in b/units/systemd-networkd.service.in
index 1bd423e2cacf0f7a898114490c94aaebb81f309f..6fb2b7e2dbaa7f5a1a472ed69fce254598995ab7 100644 (file)
--- a/units/systemd-networkd.service.in
+++ b/units/systemd-networkd.service.in
@@ -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

diff --git a/units/systemd-nsresourced.service.in b/units/systemd-nsresourced.service.in
index 3c927059e8b7ad66eab72e1878e4bd6d33c6be5e..6ecfefc7cf174adb54cda1c9bddc0de8b6c16325 100644 (file)
--- a/units/systemd-nsresourced.service.in
+++ b/units/systemd-nsresourced.service.in
@@ -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

diff --git a/units/systemd-oomd.service.in b/units/systemd-oomd.service.in
index 2486afe4053888f71fdd4ddd0dc3ac36c108aaa1..0bc2c3c358f766b8d0e6b74f479e2cca24b5c87b 100644 (file)
--- a/units/systemd-oomd.service.in
+++ b/units/systemd-oomd.service.in
@@ -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

diff --git a/units/systemd-resolved.service.in b/units/systemd-resolved.service.in
index a9224f09dae433f378f8f4a468cc95b8b49ca171..fd046f284f2355ee37db79dfc69300c34d7c0626 100644 (file)
--- a/units/systemd-resolved.service.in
+++ b/units/systemd-resolved.service.in
@@ -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

diff --git a/units/systemd-userdbd.service.in b/units/systemd-userdbd.service.in
index e853bb0c6fcd165f59d2b3c8a34601e516877030..6f98704b0a2c911e5b570ce2582e6d64263adc3f 100644 (file)
--- a/units/systemd-userdbd.service.in
+++ b/units/systemd-userdbd.service.in
@@ -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