final v236 update (#7649)

[thirdparty/systemd.git] / man / systemd-machine-id-setup.xml

diff --git a/man/systemd-machine-id-setup.xml b/man/systemd-machine-id-setup.xml
index efcf408332cf9de34bf563bef166b375a804b6f5..527cb7bff5d8012473ad56bef373648f809dcc0e 100644 (file)
--- a/man/systemd-machine-id-setup.xml
+++ b/man/systemd-machine-id-setup.xml
@@ -3,6 +3,8 @@
   "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
 
 <!--
+  SPDX-License-Identifier: LGPL-2.1+
+
   This file is part of systemd.
 
   Copyright 2012 Lennart Poettering
@@ -71,7 +73,7 @@
     for more information about this file.</para>
 
     <para>If the tool is invoked without the <option>--commit</option>
-    switch <filename>/etc/machine-id</filename> is initialized with a
+    switch, <filename>/etc/machine-id</filename> is initialized with a
     valid, new machined ID if it is missing or empty. The new machine
     ID will be acquired in the following fashion:</para>
 
@@ -82,20 +84,20 @@
       <filename>/etc/machine-id</filename>.</para></listitem>
 
       <listitem><para>If run inside a KVM virtual machine and a UUID
-      is was configured (via the <option>-uuid</option>
+      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>Similar, 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
+      <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="http://www.freedesktop.org/wiki/Software/systemd/ContainerInterface">Container
+      url="https://www.freedesktop.org/wiki/Software/systemd/ContainerInterface">Container
       Interface</ulink>.</para></listitem>
 
-      <listitem><para>Otherwise a new ID is randomly
+      <listitem><para>Otherwise, a new ID is randomly
       generated.</para></listitem>
     </orderedlist>
 
@@ -148,7 +150,13 @@
 
         <para>This command is primarily used by the
         <citerefentry><refentrytitle>systemd-machine-id-commit.service</refentrytitle><manvolnum>8</manvolnum></citerefentry>
-        early-boot service.</para></listitem>
+        early boot service.</para></listitem>
+      </varlistentry>
+
+      <varlistentry>
+        <term><option>--print</option></term>
+
+        <listitem><para>Print the machine ID generated or committed after the operation is complete.</para></listitem>
       </varlistentry>
 
       <xi:include href="standard-options.xml" xpointer="help" />