Merging upstream version 256.

Signed-off-by: Daniel Baumann <daniel.baumann@progress-linux.org>

1 files changed, 29 insertions, 22 deletions

diff --git a/man/systemd-machine-id-setup.xml b/man/systemd-machine-id-setup.xml
index d1a77bd..bb53cc7 100644
--- a/man/systemd-machine-id-setup.xml
+++ b/man/systemd-machine-id-setup.xml
@@ -1,6 +1,6 @@
 <?xml version='1.0'?>
 <!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
-  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+  "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd">
 <!-- SPDX-License-Identifier: LGPL-2.1-or-later -->
 
 <refentry id="systemd-machine-id-setup"
@@ -43,24 +43,31 @@
     ID will be acquired in the following fashion:</para>
 
     <orderedlist>
-      <listitem><para>If a valid D-Bus machine ID is already
-      configured for the system, the D-Bus machine ID is copied and
-      used to initialize the machine ID in
-      <filename>/etc/machine-id</filename>.</para></listitem>
-
-      <listitem><para>If run inside a KVM virtual machine and a UUID
-      is configured (via the <option>-uuid</option>
-      option), this UUID is used to initialize the machine ID. The
-      caller must ensure that the UUID passed is sufficiently unique
-      and is different for every booted instance of the
-      VM.</para></listitem>
+      <listitem><para>If a valid machine ID is stored in <filename>/run/machine-id</filename>, the machine ID
+      is copied and used to initialize the machine ID in <filename>/etc/machine-id</filename>. This step is
+      skipped if <option>--root=</option> is specified or running in a chroot environment.</para></listitem>
+
+      <listitem><para>If a valid D-Bus machine ID is already configured for the system, the D-Bus machine ID
+      is copied and used to initialize the machine ID in <filename>/etc/machine-id</filename>.
+      </para></listitem>
+
+      <listitem><para>If a valid machine ID is provided through <option>system.machine_id</option> credential,
+      the machine ID is copied and used to initialize the machine ID in <filename>/etc/machine-id</filename>.
+      This step is skipped if <option>--root=</option> is specified or running in a chroot environment.
+      </para></listitem>
+
+      <listitem><para>If run inside a KVM virtual machine and a UUID is configured (via the
+      <option>-uuid</option> option), this UUID is used to initialize the machine ID. The caller must ensure
+      that the UUID passed is sufficiently unique and is different for every booted instance of the VM. This
+      step is skipped if <option>--root=</option> is specified or running in a chroot environment.
+      </para></listitem>
 
       <listitem><para>Similarly, if run inside a Linux container environment and a UUID is configured for the
       container, this is used to initialize the machine ID. For details, see the documentation of the <ulink
-      url="https://systemd.io/CONTAINER_INTERFACE">Container Interface</ulink>.</para></listitem>
+      url="https://systemd.io/CONTAINER_INTERFACE">Container Interface</ulink>. This step is skipped if
+      <option>--root=</option> is specified or running in a chroot environment.</para></listitem>
 
-      <listitem><para>Otherwise, a new ID is randomly
-      generated.</para></listitem>
+      <listitem><para>Otherwise, a new ID is randomly generated.</para></listitem>
     </orderedlist>
 
     <para>The <option>--commit</option> switch may be used to commit a
@@ -152,13 +159,13 @@
 
   <refsect1>
     <title>See Also</title>
-    <para>
-      <citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>machine-id</refentrytitle><manvolnum>5</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>systemd-machine-id-commit.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>,
-      <citerefentry project='dbus'><refentrytitle>dbus-uuidgen</refentrytitle><manvolnum>1</manvolnum></citerefentry>,
-      <citerefentry><refentrytitle>systemd-firstboot</refentrytitle><manvolnum>1</manvolnum></citerefentry>
-    </para>
+    <para><simplelist type="inline">
+      <member><citerefentry><refentrytitle>systemd</refentrytitle><manvolnum>1</manvolnum></citerefentry></member>
+      <member><citerefentry><refentrytitle>machine-id</refentrytitle><manvolnum>5</manvolnum></citerefentry></member>
+      <member><citerefentry><refentrytitle>systemd-machine-id-commit.service</refentrytitle><manvolnum>8</manvolnum></citerefentry></member>
+      <member><citerefentry project='dbus'><refentrytitle>dbus-uuidgen</refentrytitle><manvolnum>1</manvolnum></citerefentry></member>
+      <member><citerefentry><refentrytitle>systemd-firstboot</refentrytitle><manvolnum>1</manvolnum></citerefentry></member>
+    </simplelist></para>
   </refsect1>
 
 </refentry>