chiark / gitweb /
Make initrd.target the default target in the initrd
authorHarald Hoyer <harald@redhat.com>
Thu, 14 Mar 2013 12:12:10 +0000 (13:12 +0100)
committerHarald Hoyer <harald@redhat.com>
Thu, 14 Mar 2013 23:49:37 +0000 (00:49 +0100)
commit9e5f0f92915b777308797294c6e103e430957b5d
treedaf284ba6992764b083d43bb9cfb66eed8319c6e
parentc1dae1b3c9729fb8ab749dd4e2dad07e0fad7ed8
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
Makefile.am
man/bootup.xml
man/systemd.special.xml
src/core/special.h
src/fstab-generator/fstab-generator.c
units/initrd-cleanup.service.in
units/initrd-fs.target
units/initrd-parse-etc.service.in
units/initrd-root-fs.target [moved from units/root-fs.target with 89% similarity]
units/initrd-switch-root.target
units/initrd.target [new file with mode: 0644]