summaryrefslogtreecommitdiffstats
path: root/units/initrd-parse-etc.service.in
diff options
context:
space:
mode:
authorHarald Hoyer <harald@redhat.com>2013-03-14 13:12:10 +0100
committerHarald Hoyer <harald@redhat.com>2013-03-15 00:49:37 +0100
commit9e5f0f92915b777308797294c6e103e430957b5d (patch)
treedaf284ba6992764b083d43bb9cfb66eed8319c6e /units/initrd-parse-etc.service.in
parentmain: don't mount /sys, /dev and friends when we run with PID != 1 (diff)
downloadsystemd-9e5f0f92915b777308797294c6e103e430957b5d.tar.xz
systemd-9e5f0f92915b777308797294c6e103e430957b5d.zip
Make initrd.target the default target in the initrd
First, rename root-fs.target to initrd-root-fs.target to clarify its usage. Mount units with "x-initrd-rootfs.mount" are now ordered before initrd-root-fs.target. As we sometimes construct /sysroot mounts in /etc/fstab in the initrd, we want these to be mounted before the initrd-root-fs.target is active. initrd.target can be the default target in the initrd. (normal startup) : : v basic.target | ______________________/| / | | sysroot.mount | | | v | initrd-root-fs.target | | | v | initrd-parse-etc.service (custom initrd services) | | v | (sysroot-usr.mount and | various mounts marked | with fstab option | x-initrd.mount) | | | v | initrd-fs.target | | \______________________ | \| v initrd.target | v initrd-cleanup.service isolates to initrd-switch-root.target | v ______________________/| / | | initrd-udevadm-cleanup-db.service | | (custom initrd services) | | | \______________________ | \| v initrd-switch-root.target | v initrd-switch-root.service | v switch-root
Diffstat (limited to 'units/initrd-parse-etc.service.in')
-rw-r--r--units/initrd-parse-etc.service.in7
1 files changed, 4 insertions, 3 deletions
diff --git a/units/initrd-parse-etc.service.in b/units/initrd-parse-etc.service.in
index 44fee7bd34..07728e200f 100644
--- a/units/initrd-parse-etc.service.in
+++ b/units/initrd-parse-etc.service.in
@@ -8,13 +8,14 @@
[Unit]
Description=Reload Configuration from the Real Root
DefaultDependencies=no
-Requires=root-fs.target
-After=root-fs.target
+Requires=initrd-root-fs.target
+After=initrd-root-fs.target
OnFailure=emergency.target
ConditionPathExists=/etc/initrd-release
[Service]
Type=oneshot
ExecStartPre=@rootbindir@/systemctl daemon-reload
-ExecStart=@rootbindir@/systemctl start initrd-fs.target
+# we have to retrigger initrd-fs.target after daemon-reload
+ExecStart=-@rootbindir@/systemctl --no-block start initrd-fs.target
ExecStart=@rootbindir@/systemctl --no-block start initrd-cleanup.service