From 6cfd19cfd12c6dc1cec4de28cf873f532c5ab447 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 19 Apr 2024 18:34:43 +0200 Subject: [PATCH 1/3] man: add separate column for flag value to table --- man/systemd-gpt-auto-generator.xml | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/man/systemd-gpt-auto-generator.xml b/man/systemd-gpt-auto-generator.xml index c8cf12a005..b94c47bcdf 100644 --- a/man/systemd-gpt-auto-generator.xml +++ b/man/systemd-gpt-auto-generator.xml @@ -157,32 +157,37 @@ Partition Attribute Flags - + + Flag + Value Applicable to Explanation - SD_GPT_FLAG_READ_ONLY 0x1000000000000000 + SD_GPT_FLAG_READ_ONLY + 0x1000000000000000 /, /home/, /srv/, /var/, /var/tmp/, Extended Boot Loader Partition Partition is mounted read-only - SD_GPT_FLAG_NO_AUTO 0x8000000000000000 + SD_GPT_FLAG_NO_AUTO + 0x8000000000000000 /, /home/, /srv/, /var/, /var/tmp/, Extended Boot Loader Partition Partition is not mounted automatically - SD_GPT_FLAG_NO_BLOCK_IO_PROTOCOL 0x0000000000000002 + SD_GPT_FLAG_NO_BLOCK_IO_PROTOCOL + 0x0000000000000002 EFI System Partition (ESP) Partition is not mounted automatically From 1bf7e13c55d575a6cdd70e4444321719ea1ff0c0 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 19 Apr 2024 18:36:16 +0200 Subject: [PATCH 2/3] man: add explicit column for gpt guid value in table --- man/systemd-gpt-auto-generator.xml | 40 +++++++++++++++++++----------- 1 file changed, 25 insertions(+), 15 deletions(-) diff --git a/man/systemd-gpt-auto-generator.xml b/man/systemd-gpt-auto-generator.xml index b94c47bcdf..b967aab8e2 100644 --- a/man/systemd-gpt-auto-generator.xml +++ b/man/systemd-gpt-auto-generator.xml @@ -73,14 +73,16 @@
Partition Type GUIDs - + + - Partition Type GUID + Partition Type + GUID Name Mount Point Explanation @@ -88,63 +90,71 @@ - SD_GPT_ROOT_X86_64 4f68bce3-e8cd-4db1-96e7-fbcaf984b709 + SD_GPT_ROOT_X86_64 + 4f68bce3-e8cd-4db1-96e7-fbcaf984b709 Root Partition (x86-64) / The first partition with this type UUID, located on the same disk as the ESP, is used as the root file system / on AMD64 / 64-bit x86 systems. - SD_GPT_ROOT_ARM64 b921b045-1df0-41c3-af44-4c6f280d3fae + SD_GPT_ROOT_ARM64 + b921b045-1df0-41c3-af44-4c6f280d3fae Root Partition (64-bit ARM) / The first partition with this type UUID, located on the same disk as the ESP, is used as the root file system / on AArch64 / 64-bit ARM systems. - - SD_GPT_ROOT_ALPHA SD_GPT_ROOT_ARC SD_GPT_ROOT_ARM SD_GPT_ROOT_ARM64 SD_GPT_ROOT_IA64 SD_GPT_ROOT_LOONGARCH64 SD_GPT_ROOT_MIPS SD_GPT_ROOT_MIPS64 SD_GPT_ROOT_MIPS_LE SD_GPT_ROOT_MIPS64_LE SD_GPT_ROOT_PARISC SD_GPT_ROOT_PPC SD_GPT_ROOT_PPC64 SD_GPT_ROOT_PPC64_LE SD_GPT_ROOT_RISCV32 SD_GPT_ROOT_RISCV64 SD_GPT_ROOT_S390 SD_GPT_ROOT_S390X SD_GPT_ROOT_TILEGX SD_GPT_ROOT_X86 SD_GPT_ROOT_X86_64 SD_GPT_USR_ALPHA SD_GPT_USR_ARC SD_GPT_USR_ARM SD_GPT_USR_IA64 SD_GPT_USR_LOONGARCH64 SD_GPT_USR_MIPS_LE SD_GPT_USR_MIPS64_LE SD_GPT_USR_PARISC SD_GPT_USR_PPC SD_GPT_USR_PPC64 SD_GPT_USR_PPC64_LE SD_GPT_USR_RISCV32 SD_GPT_USR_RISCV64 SD_GPT_USR_S390 SD_GPT_USR_S390X SD_GPT_USR_TILEGX SD_GPT_USR_X86 - - root partitions for other architectures + SD_GPT_ROOT_ALPHA SD_GPT_ROOT_ARC SD_GPT_ROOT_ARM SD_GPT_ROOT_ARM64 SD_GPT_ROOT_IA64 SD_GPT_ROOT_LOONGARCH64 SD_GPT_ROOT_MIPS SD_GPT_ROOT_MIPS64 SD_GPT_ROOT_MIPS_LE SD_GPT_ROOT_MIPS64_LE SD_GPT_ROOT_PARISC SD_GPT_ROOT_PPC SD_GPT_ROOT_PPC64 SD_GPT_ROOT_PPC64_LE SD_GPT_ROOT_RISCV32 SD_GPT_ROOT_RISCV64 SD_GPT_ROOT_S390 SD_GPT_ROOT_S390X SD_GPT_ROOT_TILEGX SD_GPT_ROOT_X86 SD_GPT_ROOT_X86_64 SD_GPT_USR_ALPHA SD_GPT_USR_ARC SD_GPT_USR_ARM SD_GPT_USR_IA64 SD_GPT_USR_LOONGARCH64 SD_GPT_USR_MIPS_LE SD_GPT_USR_MIPS64_LE SD_GPT_USR_PARISC SD_GPT_USR_PPC SD_GPT_USR_PPC64 SD_GPT_USR_PPC64_LE SD_GPT_USR_RISCV32 SD_GPT_USR_RISCV64 SD_GPT_USR_S390 SD_GPT_USR_S390X SD_GPT_USR_TILEGX SD_GPT_USR_X86 + … + Root partitions for other architectures / The first partition with the type UUID matching the architecture, located on the same disk as the ESP, is used as the root file system /. For the full list and constant values, see Discoverable Partitions Specification. - SD_GPT_HOME 933ac7e1-2eb4-4f13-b844-0e14e2aef915 + SD_GPT_HOME + 933ac7e1-2eb4-4f13-b844-0e14e2aef915 Home Partition /home/ The first partition with this type UUID on the same disk as the ESP is mounted to /home/. - SD_GPT_SRV 3b8f8425-20e0-4f3b-907f-1a25a76f98e8 + SD_GPT_SRV + 3b8f8425-20e0-4f3b-907f-1a25a76f98e8 Server Data Partition /srv/ The first partition with this type UUID on the same disk as the ESP is mounted to /srv/. - SD_GPT_VAR 4d21b016-b534-45c2-a9fb-5c16e091fd2d + SD_GPT_VAR + 4d21b016-b534-45c2-a9fb-5c16e091fd2d Variable Data Partition /var/ The first partition with this type UUID on the same disk as the ESP is mounted to /var/ — under the condition its partition UUID matches the first 128 bit of the HMAC-SHA256 of the GPT type uuid of this partition keyed by the machine ID of the installation stored in machine-id5. - SD_GPT_TMP 7ec6f557-3bc5-4aca-b293-16ef5df639d1 + SD_GPT_TMP + 7ec6f557-3bc5-4aca-b293-16ef5df639d1 Temporary Data Partition /var/tmp/ The first partition with this type UUID on the same disk as the ESP is mounted to /var/tmp/. - SD_GPT_SWAP 0657fd6d-a4ab-43c4-84e5-0933c84b4f4f + SD_GPT_SWAP + 0657fd6d-a4ab-43c4-84e5-0933c84b4f4f Swap n/a All partitions with this type UUID on the same disk as the ESP are used as swap. - SD_GPT_ESP c12a7328-f81f-11d2-ba4b-00a0c93ec93b + SD_GPT_ESP + c12a7328-f81f-11d2-ba4b-00a0c93ec93b EFI System Partition (ESP) /efi/ or /boot/ The first partition with this type UUID located on the same disk as the root partition is mounted to /boot/ or /efi/, see below. - SD_GPT_XBOOTLDR bc13c2ff-59e6-4262-a352-b275fd6f7172 + SD_GPT_XBOOTLDR + bc13c2ff-59e6-4262-a352-b275fd6f7172 Extended Boot Loader Partition /boot/ The first partition with this type UUID located on the same disk as the root partition is mounted to /boot/, see below. From 366af154fafeebba53196d589265fe995ae21220 Mon Sep 17 00:00:00 2001 From: Lennart Poettering Date: Fri, 19 Apr 2024 18:36:33 +0200 Subject: [PATCH 3/3] man: correct where we look for auxiliary partitions We look for the root fs on the device of the booted ESP, and for the other partitions on the device of the root fs. On EFI systems this generally boils down to the same, but there are cases where this doesn't hold, hence document this properly. Fixes: #31199 --- man/systemd-gpt-auto-generator.xml | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/man/systemd-gpt-auto-generator.xml b/man/systemd-gpt-auto-generator.xml index b967aab8e2..0893b3f4e8 100644 --- a/man/systemd-gpt-auto-generator.xml +++ b/man/systemd-gpt-auto-generator.xml @@ -94,56 +94,56 @@ 4f68bce3-e8cd-4db1-96e7-fbcaf984b709 Root Partition (x86-64) / - The first partition with this type UUID, located on the same disk as the ESP, is used as the root file system / on AMD64 / 64-bit x86 systems. + The first partition with this type UUID, located on the same disk as the ESP used for booting, is used as the root file system / on AMD64 / 64-bit x86 systems. SD_GPT_ROOT_ARM64 b921b045-1df0-41c3-af44-4c6f280d3fae Root Partition (64-bit ARM) / - The first partition with this type UUID, located on the same disk as the ESP, is used as the root file system / on AArch64 / 64-bit ARM systems. + The first partition with this type UUID, located on the same disk as the ESP used for booting, is used as the root file system / on AArch64 / 64-bit ARM systems. SD_GPT_ROOT_ALPHA SD_GPT_ROOT_ARC SD_GPT_ROOT_ARM SD_GPT_ROOT_ARM64 SD_GPT_ROOT_IA64 SD_GPT_ROOT_LOONGARCH64 SD_GPT_ROOT_MIPS SD_GPT_ROOT_MIPS64 SD_GPT_ROOT_MIPS_LE SD_GPT_ROOT_MIPS64_LE SD_GPT_ROOT_PARISC SD_GPT_ROOT_PPC SD_GPT_ROOT_PPC64 SD_GPT_ROOT_PPC64_LE SD_GPT_ROOT_RISCV32 SD_GPT_ROOT_RISCV64 SD_GPT_ROOT_S390 SD_GPT_ROOT_S390X SD_GPT_ROOT_TILEGX SD_GPT_ROOT_X86 SD_GPT_ROOT_X86_64 SD_GPT_USR_ALPHA SD_GPT_USR_ARC SD_GPT_USR_ARM SD_GPT_USR_IA64 SD_GPT_USR_LOONGARCH64 SD_GPT_USR_MIPS_LE SD_GPT_USR_MIPS64_LE SD_GPT_USR_PARISC SD_GPT_USR_PPC SD_GPT_USR_PPC64 SD_GPT_USR_PPC64_LE SD_GPT_USR_RISCV32 SD_GPT_USR_RISCV64 SD_GPT_USR_S390 SD_GPT_USR_S390X SD_GPT_USR_TILEGX SD_GPT_USR_X86 … Root partitions for other architectures / - The first partition with the type UUID matching the architecture, located on the same disk as the ESP, is used as the root file system /. For the full list and constant values, see Discoverable Partitions Specification. + The first partition with the type UUID matching the architecture, located on the same disk as the ESP used for booting, is used as the root file system /. For the full list and constant values, see Discoverable Partitions Specification. SD_GPT_HOME 933ac7e1-2eb4-4f13-b844-0e14e2aef915 Home Partition /home/ - The first partition with this type UUID on the same disk as the ESP is mounted to /home/. + The first partition with this type UUID on the same disk as the root partition is mounted to /home/. SD_GPT_SRV 3b8f8425-20e0-4f3b-907f-1a25a76f98e8 Server Data Partition /srv/ - The first partition with this type UUID on the same disk as the ESP is mounted to /srv/. + The first partition with this type UUID on the same disk as the root partition is mounted to /srv/. SD_GPT_VAR 4d21b016-b534-45c2-a9fb-5c16e091fd2d Variable Data Partition /var/ - The first partition with this type UUID on the same disk as the ESP is mounted to /var/ — under the condition its partition UUID matches the first 128 bit of the HMAC-SHA256 of the GPT type uuid of this partition keyed by the machine ID of the installation stored in machine-id5. + The first partition with this type UUID on the same disk as the root partition is mounted to /var/ — under the condition its partition UUID matches the first 128 bit of the HMAC-SHA256 of the GPT type uuid of this partition keyed by the machine ID of the installation stored in machine-id5. SD_GPT_TMP 7ec6f557-3bc5-4aca-b293-16ef5df639d1 Temporary Data Partition /var/tmp/ - The first partition with this type UUID on the same disk as the ESP is mounted to /var/tmp/. + The first partition with this type UUID on the same disk as the root partition is mounted to /var/tmp/. SD_GPT_SWAP 0657fd6d-a4ab-43c4-84e5-0933c84b4f4f Swap n/a - All partitions with this type UUID on the same disk as the ESP are used as swap. + All partitions with this type UUID on the same disk as the root partition are used as swap. SD_GPT_ESP