rancher/osbuilder
1
0
Fork 0
mirror of https://github.com/kairos-io/osbuilder.git synced 2025-07-09 05:03:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #69 from Itxaka/revert_gpt

Browse Source
This commit is contained in:
Itxaka 2023-07-17 10:22:36 +02:00 committed by GitHub
commit d8a56badc1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
tools-image/build-arm-image.sh
View File

@ -345,8 +345,6 @@ partprobe
echo ">> Writing image and partition table" echo ">> Writing image and partition table"
dd if=/dev/zero of="${output_image}" bs=1024000 count="${size}" || exit 1 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 if [ "$model" == "rpi64" ]; then
sgdisk -n 1:8192:+96M -c 1:EFI -t 1:0c00 ${output_image} sgdisk -n 1:8192:+96M -c 1:EFI -t 1:0c00 ${output_image}
else else
@ -360,8 +358,11 @@ sgdisk -n 3:0:+$(( ${recovery_size} + ${oem_size} ))M -c 3:lvm -t 3:8e00 ${outpu
fi fi
sgdisk -n 4:0:+64M -c 4:persistent -t 4:8300 ${output_image} sgdisk -n 4:0:+64M -c 4:persistent -t 4:8300 ${output_image}
# Make the disk GPT sgdisk -m 1:2:3:4 ${output_image}
sgdisk -g ${output_image}
if [ "$model" == "rpi64" ]; then
sfdisk --part-type ${output_image} 1 c
fi
# Prepare the image and copy over the files # Prepare the image and copy over the files
@ -382,7 +383,7 @@ export device="/dev/mapper/${device}"
partprobe partprobe
kpartx -vag $DRIVE kpartx -va $DRIVE
echo ">> Populating partitions" echo ">> Populating partitions"
efi=${device}p1 efi=${device}p1
@ -470,7 +471,7 @@ sync
sleep 5 sleep 5
sync sync
kpartx -dvg $DRIVE || true kpartx -dv $DRIVE || true
umount $DRIVE || true umount $DRIVE || true