Revert "units/initrd-*: require initrd-fs.target rather than local-fs.target"

This reverts commit 7d89ce303fb59743a4392eeb3110c00f100172ca.

diff --git a/units/initrd-cleanup.service b/units/initrd-cleanup.service
index 061f803d5575b433b8d2a33614d58396f0cebe8a..89986964ea73b64d266a87ee8557a9374e339d67 100644 (file)
--- a/units/initrd-cleanup.service
+++ b/units/initrd-cleanup.service
@@ -10,8 +10,8 @@ Description=Cleaning Up and Shutting Down Daemons
 DefaultDependencies=no
 ConditionPathExists=/etc/initrd-release
 OnFailure=emergency.target
 DefaultDependencies=no
 ConditionPathExists=/etc/initrd-release
 OnFailure=emergency.target

-Requires=initrd-fs.target swap.target
-After=initrd-fs.target swap.target
+Requires=local-fs.target swap.target
+After=local-fs.target swap.target

 
 [Service]
 Type=oneshot
 
 [Service]
 Type=oneshot

diff --git a/units/initrd-parse-etc.service b/units/initrd-parse-etc.service
index 99e8c33978c14e6fec6097a979b895f2a1c269c9..4bfbb0f9fbce7a76399fe014084d988cd4e6a109 100644 (file)
--- a/units/initrd-parse-etc.service
+++ b/units/initrd-parse-etc.service
@@ -8,13 +8,12 @@
 [Unit]
 Description=Reload Configuration from the Real Root
 DefaultDependencies=no
 [Unit]
 Description=Reload Configuration from the Real Root
 DefaultDependencies=no

-Requires=initrd-fs.target swap.target sysroot.mount
-After=initrd-fs.target swap.target sysroot.mount
+Requires=local-fs.target swap.target
+After=local-fs.target swap.target

 OnFailure=emergency.target
 ConditionPathExists=/etc/initrd-release
 
 [Service]
 Type=oneshot
 ExecStartPre=/usr/bin/systemctl daemon-reload
 OnFailure=emergency.target
 ConditionPathExists=/etc/initrd-release
 
 [Service]
 Type=oneshot
 ExecStartPre=/usr/bin/systemctl daemon-reload

-ExecStart=/usr/bin/systemctl start initrd-fs.target

 ExecStart=/usr/bin/systemctl --no-block start initrd-cleanup.service
 ExecStart=/usr/bin/systemctl --no-block start initrd-cleanup.service

diff --git a/units/initrd-switch-root.target b/units/initrd-switch-root.target
index ffadfc09b6d008ea25bc3a41780dcc30f4f08c12..f706d29ba6e51979950b7cd48eaf0ac752f82f06 100644 (file)
--- a/units/initrd-switch-root.target
+++ b/units/initrd-switch-root.target
@@ -12,5 +12,5 @@ DefaultDependencies=no
 Requires=initrd-switch-root.service
 Before=initrd-switch-root.service
 AllowIsolate=yes
 Requires=initrd-switch-root.service
 Before=initrd-switch-root.service
 AllowIsolate=yes

-Wants=initrd-udevadm-cleanup-db.service initrd-fs.target swap.target systemd-journald.service
-After=initrd-udevadm-cleanup-db.service initrd-fs.target swap.target emergency.service emergency.target
+Wants=initrd-udevadm-cleanup-db.service local-fs.target swap.target systemd-journald.service
+After=initrd-udevadm-cleanup-db.service local-fs.target swap.target emergency.service emergency.target