rancher/osbuilder
1
0
Fork 0
mirror of https://github.com/kairos-io/osbuilder.git synced 2025-08-31 23:10:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #139 from kairos-io/bump_fedora

Browse Source
This commit is contained in:
Itxaka
2024-02-14 11:12:47 +01:00
committed by GitHub
parent 97b58723a9 446807680b
commit 907b32d5e5
2 changed files with 19 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools-image/arm/boards/rpi4.sh
View File

@@ -2,8 +2,6 @@
partprobe partprobe
kpartx -va $DRIVE
image=$1 image=$1
if [ -z "$image" ]; then if [ -z "$image" ]; then

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

@@ -73,8 +73,12 @@ cleanup() {
fi fi
losetup -D "${LOOP}" || true; losetup -D "${LOOP}" || true;
dmsetup remove KairosVG-oem || true; losetup -D "${DRIVE}" || true;
dmsetup remove KairosVG-recovery || true;
if [ "$model" == "rpi3" ]; then
dmsetup remove KairosVG-oem || true;
dmsetup remove KairosVG-recovery || true;
fi
} }
ensure_dir_structure() { ensure_dir_structure() {
@@ -364,14 +368,19 @@ if [ "$model" == "rpi3" ]; then
sgdisk -m 1:2:3:4 ${output_image} sgdisk -m 1:2:3:4 ${output_image}
sfdisk --part-type ${output_image} 1 c sfdisk --part-type ${output_image} 1 c
elif [ "$model" == "rpi4" ]; then elif [ "$model" == "rpi4" ]; then
echo "label: gpt" | sfdisk "${output_image}" sgdisk -n 1:0:+96M -c 1:EFI -t 1:ef00 ${output_image}
sgdisk -n 1:8192:+96M -c 1:EFI -t 1:0c00 ${output_image} partprobe
sgdisk -n 2:0:+${state_size}M -c 2:state -t 2:8300 ${output_image} sgdisk -n 2:0:+${state_size}M -c 2:state -t 2:8300 ${output_image}
partprobe
sgdisk -n 3:0:+${recovery_size}M -c 3:recovery -t 3:8300 ${output_image} sgdisk -n 3:0:+${recovery_size}M -c 3:recovery -t 3:8300 ${output_image}
partprobe
sgdisk -n 4:0:+${oem_size}M -c 4:oem -t 4:8300 ${output_image} sgdisk -n 4:0:+${oem_size}M -c 4:oem -t 4:8300 ${output_image}
partprobe
sgdisk -n 5:0:+64M -c 5:persistent -t 5:8300 ${output_image} sgdisk -n 5:0:+64M -c 5:persistent -t 5:8300 ${output_image}
sgdisk -g ${output_image} partprobe
sgdisk -m 1:2:3:4:5 ${output_image} # Move backup header to end of disk
sgdisk -e ${output_image}
sgdisk -v ${output_image}
else else
sgdisk -n 1:8192:+16M -c 1:EFI -t 1:0700 ${output_image} sgdisk -n 1:8192:+16M -c 1:EFI -t 1:0700 ${output_image}
sgdisk -n 2:0:+${state_size}M -c 2:state -t 2:8300 ${output_image} sgdisk -n 2:0:+${state_size}M -c 2:state -t 2:8300 ${output_image}
@@ -423,12 +432,12 @@ fi
# Create partitions (RECOVERY, STATE, COS_PERSISTENT) # Create partitions (RECOVERY, STATE, COS_PERSISTENT)
mkfs.vfat -F 32 ${efi} mkfs.vfat -F 32 ${efi}
fatlabel ${efi} COS_GRUB fatlabel ${efi} COS_GRUB
mkfs.ext4 -F -L ${STATE_LABEL} $state mkfs.ext3 -F -L ${STATE_LABEL} $state
mkfs.ext4 -F -L ${PERSISTENT_LABEL} $persistent mkfs.ext3 -F -L ${PERSISTENT_LABEL} $persistent
if [ "$model" == 'rpi4' ]; then if [ "$model" == 'rpi4' ]; then
mkfs.ext4 -F -L ${RECOVERY_LABEL} $recovery mkfs.ext3 -F -L ${RECOVERY_LABEL} $recovery
mkfs.ext4 -F -L ${OEM_LABEL} $oem mkfs.ext3 -F -L ${OEM_LABEL} $oem
else else
pvcreate $recovery pvcreate $recovery
vgcreate KairosVG $recovery vgcreate KairosVG $recovery