From 5fa87e9651074e8b78f632e43f0c2001a27f5b60 Mon Sep 17 00:00:00 2001 From: Matthias Lisin Date: Mon, 21 Feb 2022 02:32:25 +0100 Subject: [PATCH 1/2] tools: adjust re.match to recent gpt.h additions with addition of SD_ID128_MAKE_UUID_STR entries to src/shared/gpt.h the tool failed halfway due to falsly matching the new entries --- tools/list-discoverable-partitions.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tools/list-discoverable-partitions.py b/tools/list-discoverable-partitions.py index 57b99b2a490..500c896c9dc 100644 --- a/tools/list-discoverable-partitions.py +++ b/tools/list-discoverable-partitions.py @@ -142,7 +142,7 @@ DESCRIPTIONS = { def extract(file): for line in file: # print(line) - m = re.match(r'^#define\s+GPT_(.*SD_ID128_MAKE.*)', line) + m = re.match(r'^#define\s+GPT_(.*SD_ID128_MAKE\(.*\))', line) if not m: continue From 7d5beae28ca75725a680b0ab3ef5728a252282e5 Mon Sep 17 00:00:00 2001 From: Matthias Lisin Date: Mon, 21 Feb 2022 02:46:57 +0100 Subject: [PATCH 2/2] docs: swap Name and Partition Type UUID in header --- docs/DISCOVERABLE_PARTITIONS.md | 4 ++-- tools/list-discoverable-partitions.py | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/docs/DISCOVERABLE_PARTITIONS.md b/docs/DISCOVERABLE_PARTITIONS.md index f3fbe645adb..2d95ee44904 100644 --- a/docs/DISCOVERABLE_PARTITIONS.md +++ b/docs/DISCOVERABLE_PARTITIONS.md @@ -40,8 +40,8 @@ Interface](https://systemd.io/BOOT_LOADER_INTERFACE). ## Defined Partition Type UUIDs -| Partition Type UUID | Name | Allowed File Systems | Explanation | -|---------------------|------|----------------------|-------------| +| Name | Partition Type UUID | Allowed File Systems | Explanation | +|------|---------------------|----------------------|-------------| | _Root Partition (Alpha)_ | `6523f8ae-3eb1-4e2a-a05a-18b695ae656f` | Any native, optionally in LUKS | On systems with matching architecture, the first partition with this type UUID on the disk containing the active EFI ESP is automatically mounted to the root directory /. If the partition is encrypted with LUKS or has dm-verity integrity data (see below), the device mapper file will be named `/dev/mapper/root`. | | _Root Partition (ARC)_ | `d27f46ed-2919-4cb8-bd25-9531f3c16534` | ditto | ditto | | _Root Partition (32-bit ARM)_ | `69dad710-2ce4-4e3c-b16c-21a1d49abed3` | ditto | ditto | diff --git a/tools/list-discoverable-partitions.py b/tools/list-discoverable-partitions.py index 500c896c9dc..37ccd273024 100644 --- a/tools/list-discoverable-partitions.py +++ b/tools/list-discoverable-partitions.py @@ -6,8 +6,8 @@ import sys import uuid HEADER = f'''\ -| Partition Type UUID | Name | Allowed File Systems | Explanation | -|---------------------|------|----------------------|-------------| +| Name | Partition Type UUID | Allowed File Systems | Explanation | +|------|---------------------|----------------------|-------------| ''' ARCHITECTURES = {