summaryrefslogtreecommitdiff
path: root/man/systemctl.xml
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2022-09-21 20:07:21 +0200
committerGitHub <noreply@github.com>2022-09-21 20:07:21 +0200
commit4d0d34b4e7054f7bef105ed1ec27f976778c5c4e (patch)
tree52522848de7a5f518af573c4014c2419ea127cbc /man/systemctl.xml
parentdf4bed3f923bbe5be8e84131aa035dbab2ddf49c (diff)
parented1cf1d9707fa4c11fe0106a72fb25364e02f625 (diff)
downloadsystemd-4d0d34b4e7054f7bef105ed1ec27f976778c5c4e.tar.gz
Merge pull request #24709 from keszybz/partition-table-constants
Expose various GPT UUIDs as public contants and link them up in docs
Diffstat (limited to 'man/systemctl.xml')
-rw-r--r--man/systemctl.xml21
1 files changed, 11 insertions, 10 deletions
diff --git a/man/systemctl.xml b/man/systemctl.xml
index a7cd6398af..56bd4b84b9 100644
--- a/man/systemctl.xml
+++ b/man/systemctl.xml
@@ -487,7 +487,7 @@ Jan 12 10:46:45 example.com bluetoothd[8900]: gatt-time-server: Input/output err
the new target, possibly including the graphical environment or terminal you are currently using.
</para>
- <para>Note that this is allowed only on units where
+ <para>Note that this operation is allowed only on units where
<option>AllowIsolate=</option> is enabled. See
<citerefentry><refentrytitle>systemd.unit</refentrytitle><manvolnum>5</manvolnum></citerefentry>
for details.</para>
@@ -1527,15 +1527,16 @@ Jan 12 10:46:45 example.com bluetoothd[8900]: gatt-time-server: Input/output err
<term><command>switch-root</command> <replaceable>ROOT</replaceable> <optional><replaceable>INIT</replaceable></optional></term>
<listitem>
- <para>Switches to a different root directory and executes a new system manager process below it. This is
- intended for usage in initial RAM disks ("initrd"), and will transition from the initrd's system manager
- process (a.k.a. "init" process) to the main system manager process which is loaded from the actual host
- volume. This call takes two arguments: the directory that is to become the new root directory, and the path
- to the new system manager binary below it to execute as PID 1. If the latter is omitted or the empty
- string, a systemd binary will automatically be searched for and used as init. If the system manager path is
- omitted, equal to the empty string or identical to the path to the systemd binary, the state of the
- initrd's system manager process is passed to the main system manager, which allows later introspection of
- the state of the services involved in the initrd boot phase.</para>
+ <para>Switches to a different root directory and executes a new system manager process below it.
+ This is intended for use in the initrd, and will transition from the initrd's system manager
+ process (a.k.a. "init" process) to the main system manager process which is loaded from the
+ actual host root files system. This call takes two arguments: the directory that is to become the
+ new root directory, and the path to the new system manager binary below it to execute as PID 1.
+ If the latter is omitted or the empty string, a systemd binary will automatically be searched for
+ and used as init. If the system manager path is omitted, equal to the empty string or identical
+ to the path to the systemd binary, the state of the initrd's system manager process is passed to
+ the main system manager, which allows later introspection of the state of the services involved
+ in the initrd boot phase.</para>
</listitem>
</varlistentry>