From 4340e5b6df241e4883a1e58dc3446ea489a388a9 Mon Sep 17 00:00:00 2001 From: Daan De Meyer Date: Mon, 15 May 2023 13:52:41 +0200 Subject: Revert "units: Add missing dependencies on initrd-switch-root.target" This reverts commit f0ad3e6b9652fe785245934ff8604cc897d3b8f4. --- units/systemd-networkd-wait-online.service.in | 4 ++-- units/systemd-networkd-wait-online@.service.in | 4 ++-- units/systemd-networkd.service.in | 4 ++-- units/systemd-oomd.service.in | 4 ++-- units/systemd-pstore.service.in | 4 ++-- units/systemd-resolved.service.in | 4 ++-- units/systemd-rfkill.service.in | 4 ++-- units/systemd-timesyncd.service.in | 4 ++-- 8 files changed, 16 insertions(+), 16 deletions(-) diff --git a/units/systemd-networkd-wait-online.service.in b/units/systemd-networkd-wait-online.service.in index 40a6e897d3..3dc5ce9265 100644 --- a/units/systemd-networkd-wait-online.service.in +++ b/units/systemd-networkd-wait-online.service.in @@ -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 initrd-switch-root.target +Conflicts=shutdown.target BindsTo=systemd-networkd.service After=systemd-networkd.service -Before=network-online.target shutdown.target initrd-switch-root.target +Before=network-online.target shutdown.target [Service] Type=oneshot diff --git a/units/systemd-networkd-wait-online@.service.in b/units/systemd-networkd-wait-online@.service.in index 83dacf7007..b7a1e409f4 100644 --- a/units/systemd-networkd-wait-online@.service.in +++ b/units/systemd-networkd-wait-online@.service.in @@ -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 initrd-switch-root.target +Conflicts=shutdown.target BindsTo=systemd-networkd.service After=systemd-networkd.service -Before=network-online.target shutdown.target initrd-switch-root.target +Before=network-online.target shutdown.target [Service] Type=oneshot diff --git a/units/systemd-networkd.service.in b/units/systemd-networkd.service.in index 9f0af57fdc..585bbe5e6d 100644 --- a/units/systemd-networkd.service.in +++ b/units/systemd-networkd.service.in @@ -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 initrd-switch-root.target -Conflicts=shutdown.target initrd-switch-root.target +Before=network.target multi-user.target shutdown.target +Conflicts=shutdown.target Wants=systemd-networkd.socket network.target [Service] diff --git a/units/systemd-oomd.service.in b/units/systemd-oomd.service.in index f05cab3e0b..c138f5eefa 100644 --- a/units/systemd-oomd.service.in +++ b/units/systemd-oomd.service.in @@ -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 initrd-switch-root.target -Conflicts=shutdown.target initrd-switch-root.target +Before=multi-user.target shutdown.target +Conflicts=shutdown.target ConditionControlGroupController=v2 ConditionControlGroupController=memory ConditionPathExists=/proc/pressure/cpu diff --git a/units/systemd-pstore.service.in b/units/systemd-pstore.service.in index 7848430734..02ac29caa4 100644 --- a/units/systemd-pstore.service.in +++ b/units/systemd-pstore.service.in @@ -13,8 +13,8 @@ Documentation=man:systemd-pstore(8) ConditionDirectoryNotEmpty=/sys/fs/pstore ConditionVirtualization=!container DefaultDependencies=no -Conflicts=shutdown.target initrd-switch-root.target -Before=sysinit.target shutdown.target initrd-switch-root.target +Conflicts=shutdown.target +Before=sysinit.target shutdown.target After=modprobe@efi_pstore.service Wants=modprobe@efi_pstore.service diff --git a/units/systemd-resolved.service.in b/units/systemd-resolved.service.in index 10ce49345e..b4227ffd42 100644 --- a/units/systemd-resolved.service.in +++ b/units/systemd-resolved.service.in @@ -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 initrd-switch-root.target -Conflicts=shutdown.target initrd-switch-root.target +Before=sysinit.target network.target nss-lookup.target shutdown.target +Conflicts=shutdown.target Wants=nss-lookup.target [Service] diff --git a/units/systemd-rfkill.service.in b/units/systemd-rfkill.service.in index 24f2ccce72..56de1a1537 100644 --- a/units/systemd-rfkill.service.in +++ b/units/systemd-rfkill.service.in @@ -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 initrd-switch-root.target +Conflicts=shutdown.target After=sys-devices-virtual-misc-rfkill.device -Before=shutdown.target initrd-switch-root.target +Before=shutdown.target [Service] ExecStart={{ROOTLIBEXECDIR}}/systemd-rfkill diff --git a/units/systemd-timesyncd.service.in b/units/systemd-timesyncd.service.in index b77bb0d27b..c606461091 100644 --- a/units/systemd-timesyncd.service.in +++ b/units/systemd-timesyncd.service.in @@ -14,8 +14,8 @@ ConditionCapability=CAP_SYS_TIME ConditionVirtualization=!container DefaultDependencies=no After=systemd-sysusers.service -Before=time-set.target sysinit.target shutdown.target initrd-switch-root.target -Conflicts=shutdown.target initrd-switch-root.target +Before=time-set.target sysinit.target shutdown.target +Conflicts=shutdown.target Wants=time-set.target [Service] -- cgit v1.2.3