From a2b1ee45367860c00c418f39636342e52f1818b7 Mon Sep 17 00:00:00 2001 From: Itxaka Date: Mon, 17 Jul 2023 10:19:25 +0200 Subject: [PATCH 1/3] Revert "Use GPT for raw images" This reverts commit 6b69df91a51147063cc9d6eeab299013b400b337. --- tools-image/build-arm-image.sh | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/tools-image/build-arm-image.sh b/tools-image/build-arm-image.sh index a27a92f..54afbb4 100755 --- a/tools-image/build-arm-image.sh +++ b/tools-image/build-arm-image.sh @@ -345,8 +345,6 @@ partprobe echo ">> Writing image and partition table" dd if=/dev/zero of="${output_image}" bs=1024000 count="${size}" || exit 1 -# make it gpt -echo "label: gpt" | sfdisk "${output_image}" if [ "$model" == "rpi64" ]; then sgdisk -n 1:8192:+96M -c 1:EFI -t 1:0c00 ${output_image} else @@ -382,7 +380,7 @@ export device="/dev/mapper/${device}" partprobe -kpartx -vag $DRIVE +kpartx -va $DRIVE echo ">> Populating partitions" efi=${device}p1 From eb6171b08c9da61ee1d02cb8e1f33810a1d8c0bd Mon Sep 17 00:00:00 2001 From: Itxaka Date: Mon, 17 Jul 2023 10:19:32 +0200 Subject: [PATCH 2/3] Revert "Really make it gpt" This reverts commit a923f2e5585d5fe11a9a03434062daa6503b7334. --- tools-image/build-arm-image.sh | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/tools-image/build-arm-image.sh b/tools-image/build-arm-image.sh index 54afbb4..d168ff1 100755 --- a/tools-image/build-arm-image.sh +++ b/tools-image/build-arm-image.sh @@ -358,8 +358,7 @@ sgdisk -n 3:0:+$(( ${recovery_size} + ${oem_size} ))M -c 3:lvm -t 3:8e00 ${outpu fi sgdisk -n 4:0:+64M -c 4:persistent -t 4:8300 ${output_image} -# Make the disk GPT -sgdisk -g ${output_image} +sgdisk -m 1:2:3:4 ${output_image} # Prepare the image and copy over the files @@ -468,7 +467,7 @@ sync sleep 5 sync -kpartx -dvg $DRIVE || true +kpartx -dv $DRIVE || true umount $DRIVE || true From f8353326fb01537406ea2bc7a249844fcbe7872c Mon Sep 17 00:00:00 2001 From: Itxaka Date: Mon, 17 Jul 2023 10:19:41 +0200 Subject: [PATCH 3/3] Revert "Drop uneeded sfdisk call" This reverts commit e5f563c4dbb02896de407a742272380a0071ffae. --- tools-image/build-arm-image.sh | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tools-image/build-arm-image.sh b/tools-image/build-arm-image.sh index d168ff1..53ee8ae 100755 --- a/tools-image/build-arm-image.sh +++ b/tools-image/build-arm-image.sh @@ -360,6 +360,10 @@ sgdisk -n 4:0:+64M -c 4:persistent -t 4:8300 ${output_image} sgdisk -m 1:2:3:4 ${output_image} +if [ "$model" == "rpi64" ]; then + sfdisk --part-type ${output_image} 1 c +fi + # Prepare the image and copy over the files export DRIVE=$(losetup -f "${output_image}" --show)