summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorHarald Hoyer <harald@redhat.com>2013-03-05 08:16:06 +0100
committerHarald Hoyer <harald@redhat.com>2013-03-06 11:03:39 +0100
commitfdf1848d1dc55e03b83821989bed2f8b26260236 (patch)
tree06a1d04cbd2e5a5a1afa68f150527857a44c2f4e
parent6210afbcff435c857458a908d730db176797a0f7 (diff)
Revert "units/initrd-*: require initrd-fs.target rather than local-fs.target"
This reverts commit 7d89ce303fb59743a4392eeb3110c00f100172ca.
-rw-r--r--units/initrd-cleanup.service4
-rw-r--r--units/initrd-parse-etc.service5
-rw-r--r--units/initrd-switch-root.target4
3 files changed, 6 insertions, 7 deletions
diff --git a/units/initrd-cleanup.service b/units/initrd-cleanup.service
index 061f803d55..89986964ea 100644
--- 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
-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
diff --git a/units/initrd-parse-etc.service b/units/initrd-parse-etc.service
index 99e8c33978..4bfbb0f9fb 100644
--- 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
-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
diff --git a/units/initrd-switch-root.target b/units/initrd-switch-root.target
index ffadfc09b6..f706d29ba6 100644
--- 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
-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