Skip to content

Commit 42875ed

Browse files
committed
fix(image-factory): name the layout in the partitioning step
The step line read "Partitioning for ''" on every x86 build: TARGET is empty for the GPT layout by design, so the label had nothing to name. It now says mbr or gpt, the words tool.sh's --layout uses, from inside the branch that already decides it. Not run - the factory image has to be rebuilt for it to be seen. Signed-off-by: Simon Walz <contact@simonwalz.de>
1 parent 91b20b9 commit 42875ed

1 file changed

Lines changed: 5 additions & 2 deletions

File tree

‎image-factory/create_image.sh‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -161,8 +161,11 @@ step "Creating an empty image of ${SIZE_MB} MB"
161161
dd if=/dev/zero of="${IMAGE}" bs=1M count="${SIZE_MB}"
162162
sync
163163

164-
step "Partitioning for '${TARGET}'"
164+
# The step lines name the layout as 'mbr' and 'gpt', the names tool.sh's
165+
# --layout uses. TARGET is the factory's own spelling of the same choice, and
166+
# for GPT it is empty.
165167
if [[ "${TARGET}" == "rpi" ]]; then
168+
step "Partitioning the image (mbr)"
166169
parted "${IMAGE}" --script \
167170
mklabel msdos \
168171
mkpart primary fat32 1MiB 256MiB \
@@ -172,7 +175,7 @@ if [[ "${TARGET}" == "rpi" ]]; then
172175
TARGET_BOOT_PARTITION_NUM=1
173176
TARGET_ROOT_PARTITION_NUM=2
174177
else
175-
# Partition the image
178+
step "Partitioning the image (gpt)"
176179
parted "${IMAGE}" --script \
177180
mklabel gpt \
178181
mkpart bios_boot 1MiB 3MiB \

0 commit comments

Comments
 (0)