chiark / gitweb /
Revert "units/initrd-*: require initrd-fs.target rather than local-fs.target"
authorHarald Hoyer <harald@redhat.com>
Tue, 5 Mar 2013 07:16:06 +0000 (08:16 +0100)
committerHarald Hoyer <harald@redhat.com>
Wed, 6 Mar 2013 10:03:39 +0000 (11:03 +0100)
This reverts commit 7d89ce303fb59743a4392eeb3110c00f100172ca.

units/initrd-cleanup.service
units/initrd-parse-etc.service
units/initrd-switch-root.target

index 061f803..8998696 100644 (file)
@@ -10,8 +10,8 @@ Description=Cleaning Up and Shutting Down Daemons
 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
index 99e8c33..4bfbb0f 100644 (file)
@@ -8,13 +8,12 @@
 [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
-ExecStart=/usr/bin/systemctl start initrd-fs.target
 ExecStart=/usr/bin/systemctl --no-block start initrd-cleanup.service
index ffadfc0..f706d29 100644 (file)
@@ -12,5 +12,5 @@ DefaultDependencies=no
 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