Merge pull request #12753 from jrouleau/fix/hibernate-resume-timeout

[thirdparty/systemd.git] / man / systemd-gpt-auto-generator.xml

diff --git a/man/systemd-gpt-auto-generator.xml b/man/systemd-gpt-auto-generator.xml
index c932ce5ce17fb6f18a6bcd0fc01beb53db37234f..22cd638f1f81fe9f8e4ab8198b8c276cec6d58b8 100644 (file)
--- a/man/systemd-gpt-auto-generator.xml
+++ b/man/systemd-gpt-auto-generator.xml
@@ -1,9 +1,8 @@
 <?xml version="1.0"?>
 <!--*-nxml-*-->
-<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.2//EN" "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
-<!--
-  SPDX-License-Identifier: LGPL-2.1+
--->
+<!DOCTYPE refentry PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN"
+  "http://www.oasis-open.org/docbook/xml/4.2/docbookx.dtd">
+<!-- SPDX-License-Identifier: LGPL-2.1+ -->
 <refentry id="systemd-gpt-auto-generator">
 
   <refentryinfo>
@@ -36,7 +35,7 @@
     root, <filename>/home/</filename>, <filename>/srv/</filename>, the EFI System Partition, the Extended
     Boot Loader Partition and swap partitions and creates mount and swap units for them, based on the
     partition type GUIDs of GUID partition tables (GPT), see <ulink
-    url="http://www.uefi.org/specifications">UEFI Specification</ulink>, chapter 5.  It implements the <ulink
+    url="https://uefi.org/specifications">UEFI Specification</ulink>, chapter 5.  It implements the <ulink
     url="https://www.freedesktop.org/wiki/Specifications/DiscoverablePartitionsSpec/">Discoverable Partitions
     Specification</ulink>. Note that this generator has no effect on non-GPT systems, and on specific mount
     points that are directories already containing files. Also, on systems where the units are explicitly
@@ -188,6 +187,12 @@
     <filename>/dev/mapper/home</filename> and <filename>/dev/mapper/srv</filename>. Note that this might
     create conflicts if the same partition is listed in <filename>/etc/crypttab</filename> with a different
     device mapper device name.</para>
+    
+    <para>When systemd is running in the initrd the <filename>/</filename> partition may be encrypted in LUKS
+      format as well. In this case, a device mapper device is set up under the name <filename>/dev/mapper/root</filename>,
+      and a <filename>sysroot.mount</filename> is set up that mounts the device under <filename>/sysroot</filename>.
+      For more information, see <citerefentry><refentrytitle>bootup</refentrytitle><manvolnum>7</manvolnum></citerefentry>.
+    </para>
 
     <para>Mount and automount units for the EFI System Partition (ESP) are generated on EFI systems. The ESP
     is mounted to <filename>/boot/</filename> (except if an Extended Boot Loader partition exists, see
@@ -235,7 +240,7 @@
         <term><varname>root=</varname></term>
 
         <listitem><para>When used with the special value <literal>gpt-auto</literal>, automatic discovery of
-        the root parition based on the GPT partition type is enabled.  Any other value disables this
+        the root partition based on the GPT partition type is enabled.  Any other value disables this
         generator.</para></listitem>
       </varlistentry>