From: Zbigniew Jędrzejewski-Szmek Date: Sat, 17 Sep 2022 10:19:31 +0000 (+0200) Subject: man/systemd-gpt-auto-generator: reword phrasing about partition location X-Git-Tag: v252-rc1~120^2~2 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6d88188249e254b28db15643803b6ec552c9d393;p=thirdparty%2Fsystemd.git man/systemd-gpt-auto-generator: reword phrasing about partition location "located on the same disk as the ESP is located on" is hard to grok. Let's use more natural phrasing. Also, we shouldn't say that "The first foo partition … is mounted to …", because this doesn't explain what is happening. The partition could be empty, and there could be other partitions with the "foo" content, but what matters is the UUID. --- diff --git a/man/systemd-gpt-auto-generator.xml b/man/systemd-gpt-auto-generator.xml index efdecb47a9d..8ad249ec5d9 100644 --- a/man/systemd-gpt-auto-generator.xml +++ b/man/systemd-gpt-auto-generator.xml @@ -42,8 +42,8 @@ units this generator creates are overridden, but additional implicit dependencies might be created. - This generator will only look for the root partition on the same physical disk the EFI System - Partition (ESP) is located on. Note that support from the boot loader is required: the EFI variable + This generator will only look for the root partition on the same physical disk where the EFI System + Partition (ESP) is located. Note that support from the boot loader is required: the EFI variable LoaderDevicePartUUID of the 4a67b082-0a4c-41cf-b6c7-440b29bb8c4f vendor UUID is used to determine from which partition, and hence the disk from which the system was booted. If the boot loader does not set this variable, this generator will not be able to autodetect the @@ -83,13 +83,13 @@ SD_GPT_ROOT_X86_64 4f68bce3-e8cd-4db1-96e7-fbcaf984b709 Root Partition (x86-64) / - On 64-bit x86 systems, the first x86-64 root partition on the disk the EFI ESP is located on is mounted to the root directory /. + 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 Root Partition (64-bit ARM) / - On 64-bit ARM systems, the first ARM root partition on the disk the EFI ESP is located on is mounted to the root directory /. + 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. @@ -97,49 +97,49 @@ root partitions for other architectures / - For the full list, see Discoverable Partitions Specification. + 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 Home Partition /home/ - The first home partition on the disk the root partition is located on is mounted to /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 Server Data Partition /srv/ - The first server data partition on the disk the root partition is located on is mounted to /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 Variable Data Partition /var/ - The first variable data partition on the disk the root partition is located on 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 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 Temporary Data Partition /var/tmp/ - The first temporary data partition on the disk the root partition is located on is mounted to /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 Swap n/a - All swap partitions located on the disk the root partition is located on are enabled. + 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 EFI System Partition (ESP) /efi/ or /boot/ - The first ESP located on the disk the root partition is located on is mounted to /boot/ or /efi/, see below. + 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 Extended Boot Loader Partition /boot/ - The first Extended Boot Loader Partition is mounted to /boot/, see below. + The first partition with this type UUID located on the same disk as the root partition is mounted to /boot/, see below.