units: Add missing dependencies on initrd-switch-root.target

These are all services that valid to be run in the initrd, so let's
make sure they have the appropriate dependencies on
initrd-switch-root.target so that they are stopped when we're about
to switch root.
This commit is contained in:
Daan De Meyer 2023-05-07 11:15:27 +02:00 committed by Mike Yuan
parent e71254edb0
commit f0ad3e6b96
8 changed files with 16 additions and 16 deletions

View file

@ -12,10 +12,10 @@ Description=Wait for Network to be Configured
Documentation=man:systemd-networkd-wait-online.service(8)
ConditionCapability=CAP_NET_ADMIN
DefaultDependencies=no
Conflicts=shutdown.target
Conflicts=shutdown.target initrd-switch-root.target
BindsTo=systemd-networkd.service
After=systemd-networkd.service
Before=network-online.target shutdown.target
Before=network-online.target shutdown.target initrd-switch-root.target
[Service]
Type=oneshot

View file

@ -12,10 +12,10 @@ Description=Wait for Network Interface %i to be Configured
Documentation=man:systemd-networkd-wait-online.service(8)
ConditionCapability=CAP_NET_ADMIN
DefaultDependencies=no
Conflicts=shutdown.target
Conflicts=shutdown.target initrd-switch-root.target
BindsTo=systemd-networkd.service
After=systemd-networkd.service
Before=network-online.target shutdown.target
Before=network-online.target shutdown.target initrd-switch-root.target
[Service]
Type=oneshot

View file

@ -15,8 +15,8 @@ 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
Before=network.target multi-user.target shutdown.target
Conflicts=shutdown.target
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
[Service]

View file

@ -12,8 +12,8 @@ Description=Userspace Out-Of-Memory (OOM) Killer
Documentation=man:systemd-oomd.service(8)
Documentation=man:org.freedesktop.oom1(5)
DefaultDependencies=no
Before=multi-user.target shutdown.target
Conflicts=shutdown.target
Before=multi-user.target shutdown.target initrd-switch-root.target
Conflicts=shutdown.target initrd-switch-root.target
ConditionControlGroupController=v2
ConditionControlGroupController=memory
ConditionPathExists=/proc/pressure/cpu

View file

@ -13,8 +13,8 @@ Documentation=man:systemd-pstore(8)
ConditionDirectoryNotEmpty=/sys/fs/pstore
ConditionVirtualization=!container
DefaultDependencies=no
Conflicts=shutdown.target
Before=sysinit.target shutdown.target
Conflicts=shutdown.target initrd-switch-root.target
Before=sysinit.target shutdown.target initrd-switch-root.target
After=modprobe@efi_pstore.service
Wants=modprobe@efi_pstore.service

View file

@ -16,8 +16,8 @@ Documentation=https://www.freedesktop.org/wiki/Software/systemd/writing-resolver
DefaultDependencies=no
After=systemd-sysusers.service
Before=sysinit.target network.target nss-lookup.target shutdown.target
Conflicts=shutdown.target
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
[Service]

View file

@ -12,9 +12,9 @@ Description=Load/Save RF Kill Switch Status
Documentation=man:systemd-rfkill.service(8)
DefaultDependencies=no
BindsTo=sys-devices-virtual-misc-rfkill.device
Conflicts=shutdown.target
Conflicts=shutdown.target initrd-switch-root.target
After=sys-devices-virtual-misc-rfkill.device
Before=shutdown.target
Before=shutdown.target initrd-switch-root.target
[Service]
ExecStart={{ROOTLIBEXECDIR}}/systemd-rfkill

View file

@ -14,8 +14,8 @@ ConditionCapability=CAP_SYS_TIME
ConditionVirtualization=!container
DefaultDependencies=no
After=systemd-sysusers.service
Before=time-set.target sysinit.target shutdown.target
Conflicts=shutdown.target
Before=time-set.target sysinit.target shutdown.target initrd-switch-root.target
Conflicts=shutdown.target initrd-switch-root.target
Wants=time-set.target
[Service]