diff options
author | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2022-10-13 22:30:48 +0200 |
---|---|---|
committer | Zbigniew Jędrzejewski-Szmek <zbyszek@in.waw.pl> | 2022-10-14 15:56:58 +0200 |
commit | 1485925d2d4142316e333006ad213f1c476c4d1e (patch) | |
tree | 7283a8c4653b1d58c003e132f4bbefde8a6952e6 | |
parent | 8d3b7d2fd3ea3f6588150267ec7c07cd688d6b37 (diff) | |
download | systemd-1485925d2d4142316e333006ad213f1c476c4d1e.tar.gz |
man: reword some awkward sentences
-rw-r--r-- | catalog/systemd.catalog.in | 2 | ||||
-rw-r--r-- | man/bootup.xml | 26 |
2 files changed, 11 insertions, 17 deletions
diff --git a/catalog/systemd.catalog.in b/catalog/systemd.catalog.in index 977fe8285d..4c29128f71 100644 --- a/catalog/systemd.catalog.in +++ b/catalog/systemd.catalog.in @@ -144,7 +144,7 @@ might still be busy with completing start-up. Kernel start-up required @KERNEL_USEC@ microseconds. -initrd start-up required @INITRD_USEC@ microseconds. +Initrd start-up required @INITRD_USEC@ microseconds. Userspace start-up required @USERSPACE_USEC@ microseconds. diff --git a/man/bootup.xml b/man/bootup.xml index 4004e43d7f..31f7a31518 100644 --- a/man/bootup.xml +++ b/man/bootup.xml @@ -202,22 +202,16 @@ emergency.service | | | <refsect1> <title>Bootup in the initrd</title> - <para>The initrd implementation can be set up using systemd as well. In this case, boot up inside the - initrd follows the following structure.</para> - - <para>systemd detects that it is run within an initrd by checking - for the file <filename>/etc/initrd-release</filename>. - The default target in the initrd is - <filename>initrd.target</filename>. The bootup process begins - identical to the system manager bootup (see above) until it - reaches <filename>basic.target</filename>. From there, systemd - approaches the special target <filename>initrd.target</filename>. - - Before any file systems are mounted, it must be determined whether - the system will resume from hibernation or proceed with normal boot. - This is accomplished by <filename>systemd-hibernate-resume@.service</filename> - which must be finished before <filename>local-fs-pre.target</filename>, - so no filesystems can be mounted before the check is complete. + <para>Systemd can be used in the initrd as well. It detects the initrd environment by checking for the + <filename>/etc/initrd-release</filename> file. The default target in the initrd is + <filename>initrd.target</filename>. The bootup process is identical to the system manager bootup until + the target <filename>basic.target</filename>. After that, systemd executes the special target + <filename>initrd.target</filename>. + + Before any file systems are mounted, the manager will determine whether the system shall resume from + hibernation or proceed with normal boot. This is accomplished by + <filename>systemd-hibernate-resume@.service</filename> which must be finished before + <filename>local-fs-pre.target</filename>, so no filesystems can be mounted before the check is complete. When the root device becomes available, <filename>initrd-root-device.target</filename> is reached. |