diff --git a/man/systemd-stub.xml b/man/systemd-stub.xml
index 184b10bc88..6e853336c2 100644
--- a/man/systemd-stub.xml
+++ b/man/systemd-stub.xml
@@ -55,38 +55,37 @@
- The ELF Linux kernel images will be looked for in the .linux PE
- section of the executed image.
+ A .linux section with the ELF Linux kernel image.
- OS release information, i.e. the
- os-release5 file of
- the OS the kernel belongs to, in the .osrel PE section.
+ An .osrel section with OS release information, i.e. the contents of
+ the os-release5 file
+ of the OS the kernel belongs to.
- The kernel command line to pass to the invoked kernel will be looked for in the
- .cmdline PE section.
+ A .cmdline section with the kernel command line to pass to the
+ invoked kernel.
- The initrd will be loaded from the .initrd PE
+ An .initrd section with the initrd.
+
+ A .splash section with an image (in the Windows
+ .BMP format) to show on screen before invoking the kernel.
+
+ A .dtb section with a compiled binary DeviceTree.
+
+ A .uname section with the kernel version information, i.e. the
+ output of uname -r for the kernel included in the .linux
section.
- A boot splash (in Windows .BMP format) to show on screen before
- invoking the kernel will be looked for in the .splash PE section.
+ An .sbat section with
+ SBAT revocation
+ metadata.
- A compiled binary DeviceTree will be looked for in the .dtb PE
- section.
+ A .pcrsig section with a set of cryptographic signatures for the
+ expected TPM2 PCR values after the kernel has been booted, in JSON format. This is useful for
+ implementing TPM2 policies that bind disk encryption and similar to kernels that are signed by a
+ specific key.
- Kernel version information, i.e. the output of uname -r for the
- kernel included in the UKI, in the .uname PE section.
-
- SBAT revocation
- metadata, in the .sbat PE section.
-
- A set of cryptographic signatures for expected TPM2 PCR values when this kernel is
- booted, in JSON format, in the .pcrsig section. This is useful for implementing TPM2
- policies that bind disk encryption and similar to kernels that are signed by a specific
- key.
-
- A public key in PEM format matching this TPM2 PCR signature data in the
- .pcrpkey section.
+ A .pcrpkey section with a public key in the PEM format matching the
+ signature data in the the .pcrsig section.
If UEFI SecureBoot is enabled and the .cmdline section is present in the executed
@@ -100,15 +99,14 @@
DeviceTree in the corresponding EFI configuration table. systemd-stub will ask the firmware via the
EFI_DT_FIXUP_PROTOCOL for hardware specific fixups to the DeviceTree.
- The contents of seven of these eight PE sections are measured into TPM PCR 11, that is otherwise
- not used. Thus, it can be pre-calculated without too much effort. The .pcrsig section
- is not included in this PCR measurement, since it's supposed to contain signatures for the expected
- results for these measurements, i.e. of the outputs of the measurement operation, and thus cannot also be
- input to it.
+ The contents of eight of these nine sections are measured into TPM PCR 11. It is otherwise not used
+ and thus the result can be pre-calculated without too much effort. The .pcrsig section
+ is not included in this PCR measurement, since it is supposed to contain signatures for the output of the
+ measurement operation, and thus cannot also be input to it.
- When .pcrsig and/or .pcrpkey are present in a unified kernel
- image their contents are passed to the booted kernel in an synthetic initrd cpio archive that places them in the
- /.extra/tpm2-pcr-signature.json and
+ When .pcrsig and/or .pcrpkey sections are present in a
+ unified kernel image their contents are passed to the booted kernel in an synthetic initrd cpio archive
+ that places them in the /.extra/tpm2-pcr-signature.json and
/.extra/tpm2-pcr-public-key.pem files. Typically, a
tmpfiles.d5 line then
ensures they are copied into /run/systemd/tpm2-pcr-signature.json and
@@ -395,7 +393,8 @@
/
- The main initrd from the .initrd PE section of the unified kernel image.
+ The main initrd from the .initrd PE section of the unified kernel
+ image.
@@ -412,8 +411,8 @@
/.extra/global_credentials/*.cred
- Similar, credential files in the /loader/credentials/ directory
- in the file system the unified kernel image is placed in are copied into the
+ Similarly, credential files in the /loader/credentials/
+ directory in the file system the unified kernel image is placed in are copied into the
/.extra/global_credentials/ directory in the initrd execution
environment.
@@ -433,8 +432,7 @@
/.extra/tpm2-pcr-signature.json
The TPM2 PCR signature JSON object included in the .pcrsig PE
section of the unified kernel image is copied into the
- /.extra/tpm2-pcr-signature.json file in the initrd execution
- environment.
+ /.extra/tpm2-pcr-signature.json file in the initrd execution environment.