diff options
| author | Harald Hoyer <harald@redhat.com> | 2013-03-04 19:03:05 +0100 |
|---|---|---|
| committer | Harald Hoyer <harald@redhat.com> | 2013-03-04 19:33:50 +0100 |
| commit | 7d89ce303fb59743a4392eeb3110c00f100172ca (patch) | |
| tree | 488d892d202f437e6b825d3166df8afa544a674e | |
| parent | 39b83cdab37623a546344622db9bbbc784c15df5 (diff) | |
units/initrd-*: require initrd-fs.target rather than local-fs.target
| -rw-r--r-- | units/initrd-cleanup.service | 4 | ||||
| -rw-r--r-- | units/initrd-parse-etc.service | 5 | ||||
| -rw-r--r-- | units/initrd-switch-root.target | 4 |
3 files changed, 7 insertions, 6 deletions
diff --git a/units/initrd-cleanup.service b/units/initrd-cleanup.service index 89986964ea..061f803d55 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=local-fs.target swap.target -After=local-fs.target swap.target +Requires=initrd-fs.target swap.target +After=initrd-fs.target swap.target [Service] Type=oneshot diff --git a/units/initrd-parse-etc.service b/units/initrd-parse-etc.service index 4bfbb0f9fb..99e8c33978 100644 --- a/units/initrd-parse-etc.service +++ b/units/initrd-parse-etc.service @@ -8,12 +8,13 @@ [Unit] Description=Reload Configuration from the Real Root DefaultDependencies=no -Requires=local-fs.target swap.target -After=local-fs.target swap.target +Requires=initrd-fs.target swap.target sysroot.mount +After=initrd-fs.target swap.target sysroot.mount 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 f706d29ba6..ffadfc09b6 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 local-fs.target swap.target systemd-journald.service -After=initrd-udevadm-cleanup-db.service local-fs.target swap.target emergency.service emergency.target +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 |