[PATCH v2 5/5] Revert "scripts/make-gpt.sh: allow setting partition size"

Johannes Süllner
2026-02-04T17:57:14Z

This reverts commit d4832d18f7c938782efd88185b31180d7475b575.

The only place where partition sizes were set was for the live image,
and this was removed in the parent commit.

Signed-off-by: Johannes Süllner <johannes.suellner@mailbox.org>
---
scripts/make-gpt.sh | 31 ++++++++++++-------------------
scripts/sfdisk-field.awk | 22 +++++-----------------
2 files changed, 17 insertions(+), 36 deletions(-)

diff --git a/scripts/make-gpt.sh b/scripts/make-gpt.sh
index 998a54d..e39828b 100755
--- a/scripts/make-gpt.sh
+++ b/scripts/make-gpt.sh
@@ -1,10 +1,10 @@
#!/bin/sh --
#
-# SPDX-FileCopyrightText: 2021-2023, 2025 Alyssa Ross <hi@alyssa.is>
+# SPDX-FileCopyrightText: 2021-2023 Alyssa Ross <hi@alyssa.is>
# SPDX-FileCopyrightText: 2022 Unikie
# SPDX-License-Identifier: EUPL-1.2+
#
-# usage: make-gpt.sh GPT_PATH PATH:PARTTYPE[:PARTUUID[:PARTLABEL[:PARTMiB]]]...
+# usage: make-gpt.sh GPT_PATH PATH:PARTTYPE[:PARTUUID[:PARTLABEL]]...

set -euo pipefail

@@ -35,28 +35,21 @@ scriptsDir="$(dirname "$0")"
out="$1"
shift

-table=$(for partition; do
- size="$(sizeMiB "${partition%%:*}")"
- awk -f "$scriptsDir/sfdisk-field.awk" \
- -v partition="$partition" \
- -v size="$size"
-done)
+nl='
+'
+table="label: gpt"

# Keep 1MiB free at the start, and 1MiB free at the end.
-gptMiB=2
-while read -r partition; do
- # Here we rely on sfdisk-field.awk always putting size last.
- : $((gptMiB += ${partition##*=}))
-done <<EOF
-$table
-EOF
+gptBytes=$((ONE_MiB * 2))
+for partition; do
+ sizeMiB="$(sizeMiB "${partition%%:*}")"
+ table="$table${nl}size=${sizeMiB}MiB,$(awk -f "$scriptsDir/sfdisk-field.awk" -v partition="$partition")"
+ gptBytes="$((gptBytes + sizeMiB * ONE_MiB))"
+done

rm -f "$out"
-truncate -s "${gptMiB}M" "$out"
-
+truncate -s "$gptBytes" "$out"
sfdisk --no-reread --no-tell-kernel "$out" <<EOF
-label: gpt
-sector-size: $ONE_MiB
$table
EOF

diff --git a/scripts/sfdisk-field.awk b/scripts/sfdisk-field.awk
index 78b438e..e13c86d 100644
--- a/scripts/sfdisk-field.awk
+++ b/scripts/sfdisk-field.awk
@@ -1,7 +1,7 @@
#!/usr/bin/awk -f
#
# SPDX-License-Identifier: EUPL-1.2+
-# SPDX-FileCopyrightText: 2022, 2024-2025 Alyssa Ross <hi@alyssa.is>
+# SPDX-FileCopyrightText: 2022, 2024 Alyssa Ross <hi@alyssa.is>

BEGIN {
types["root.aarch64"] = "b921b045-1df0-41c3-af44-4c6f280d3fae"
@@ -9,11 +9,12 @@ BEGIN {
types["verity.aarch64"] = "df3300ce-d69f-4c92-978c-9bfb0f38d820"
types["verity.x86_64"] = "2c7357ed-ebd2-46d9-aec1-23d437ec2bf5"

- # Field #1 is the partition path, which is read by make-gpt.sh
- # but not relevant for running sfdisk, so skip it.
+ # Field #1 is the partition path, which make-gpt.sh will turn into
+ # the size field. Since it's handled elsewhere, we skip that
+ # first field.
skip=1

- split("type uuid name size", keys)
+ split("type uuid name", keys)
split(partition, fields, ":")

arch = ENVIRON["ARCH"]
@@ -30,21 +31,8 @@ BEGIN {
if (keys[n - skip] == "type") {
if (uuid = types[fields[n] "." arch])
fields[n] = uuid
- } else if (keys[n - skip] == "size") {
- if (fields[n] < size) {
- printf "%s MiB partition content is too big for %s MiB partition\n",
- size, fields[n] > "/dev/stderr"
- exit 1
- }
-
- size = fields[n]
- continue # Handled at the end.
}

printf "%s=%s,", keys[n - skip], fields[n]
}
-
- # Always output a size field, either supplied in input or
- # default value of the size variable.
- printf "size=%s\n", size
}