BetterCorp/BetterFrame
1
0
Fork 0
mirror of https://github.com/BetterCorp/BetterFrame.git synced 2026-05-26 20:16:35 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 10

fix(rauc): lowercase PARTUUID + format BF_DATA + remove resize

Browse source 
- PARTUUID in cmdline.txt and fstab must be lowercase (initramfs
  does case-sensitive match)
- BF_DATA partition now formatted as ext4 with label (was zeroed)
- Remove resize flag from cmdline.txt (breaks GPT layout)

Co-Authored-By: Claude Opus 4.6 (1M context) <noreply@anthropic.com>
This commit is contained in:
Mitchell R 2026-05-26 00:22:58 +02:00
parent e7cf1d1e4f
commit e189d67faa
No known key found for this signature in database
1 changed files with 12 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
deploy/rauc/repartition-image.sh
View file

@ -92,8 +92,8 @@ get_part() {
echo "$NEW_PT" | jq -r ".partitiontable.partitions[$1].$2" echo "$NEW_PT" | jq -r ".partitiontable.partitions[$1].$2"
} }
PARTUUID_ROOT_A="$(get_part 2 uuid)" PARTUUID_ROOT_A="$(get_part 2 uuid | tr '[:upper:]' '[:lower:]')"
PARTUUID_ROOT_B="$(get_part 3 uuid)" PARTUUID_ROOT_B="$(get_part 3 uuid | tr '[:upper:]' '[:lower:]')"
echo " BF_ROOT_A PARTUUID: $PARTUUID_ROOT_A" echo " BF_ROOT_A PARTUUID: $PARTUUID_ROOT_A"
echo " BF_ROOT_B PARTUUID: $PARTUUID_ROOT_B" echo " BF_ROOT_B PARTUUID: $PARTUUID_ROOT_B"
@ -119,9 +119,10 @@ cp "$WORK/bootfs.vfat" "$WORK/bootfs_A.vfat"
BOOT_A_LOOP="$(losetup -f --show "$WORK/bootfs_A.vfat")" BOOT_A_LOOP="$(losetup -f --show "$WORK/bootfs_A.vfat")"
mkdir -p "$WORK/mnt-ba" mkdir -p "$WORK/mnt-ba"
mount "$BOOT_A_LOOP" "$WORK/mnt-ba" mount "$BOOT_A_LOOP" "$WORK/mnt-ba"
# Replace root= with PARTUUID (works with initramfs) # Replace root= with PARTUUID (works with initramfs). Remove 'resize' (breaks GPT).
sed -i "s|root=PARTUUID=[^ ]*|root=PARTUUID=${PARTUUID_ROOT_A}|" "$WORK/mnt-ba/cmdline.txt" 2>/dev/null || true sed -i "s|root=PARTUUID=[^ ]*|root=PARTUUID=${PARTUUID_ROOT_A}|" "$WORK/mnt-ba/cmdline.txt" 2>/dev/null || true
sed -i "s|root=/dev/[^ ]*|root=PARTUUID=${PARTUUID_ROOT_A}|" "$WORK/mnt-ba/cmdline.txt" 2>/dev/null || true sed -i "s|root=/dev/[^ ]*|root=PARTUUID=${PARTUUID_ROOT_A}|" "$WORK/mnt-ba/cmdline.txt" 2>/dev/null || true
sed -i 's/ resize//' "$WORK/mnt-ba/cmdline.txt" 2>/dev/null || true
cat > "$WORK/mnt-ba/autoboot.txt" <<'AUTOBOOT' cat > "$WORK/mnt-ba/autoboot.txt" <<'AUTOBOOT'
[all] [all]
tryboot_a_b=1 tryboot_a_b=1
@ -141,6 +142,7 @@ mkdir -p "$WORK/mnt-bb"
mount "$BOOT_B_LOOP" "$WORK/mnt-bb" mount "$BOOT_B_LOOP" "$WORK/mnt-bb"
sed -i "s|root=PARTUUID=[^ ]*|root=PARTUUID=${PARTUUID_ROOT_B}|" "$WORK/mnt-bb/cmdline.txt" 2>/dev/null || true sed -i "s|root=PARTUUID=[^ ]*|root=PARTUUID=${PARTUUID_ROOT_B}|" "$WORK/mnt-bb/cmdline.txt" 2>/dev/null || true
sed -i "s|root=/dev/[^ ]*|root=PARTUUID=${PARTUUID_ROOT_B}|" "$WORK/mnt-bb/cmdline.txt" 2>/dev/null || true sed -i "s|root=/dev/[^ ]*|root=PARTUUID=${PARTUUID_ROOT_B}|" "$WORK/mnt-bb/cmdline.txt" 2>/dev/null || true
sed -i 's/ resize//' "$WORK/mnt-bb/cmdline.txt" 2>/dev/null || true
cat > "$WORK/mnt-bb/autoboot.txt" <<'AUTOBOOT' cat > "$WORK/mnt-bb/autoboot.txt" <<'AUTOBOOT'
[all] [all]
tryboot_a_b=1 tryboot_a_b=1
@ -171,10 +173,16 @@ P_START=$(get_part 3 start)
P_SIZE=$(get_part 3 size) P_SIZE=$(get_part 3 size)
dd if=/dev/zero of="$WORK/out.img" bs=$SECTOR seek="$P_START" count="$P_SIZE" conv=notrunc status=none dd if=/dev/zero of="$WORK/out.img" bs=$SECTOR seek="$P_START" count="$P_SIZE" conv=notrunc status=none
echo "==> Zeroing BF_DATA (partition 5)" echo "==> Formatting BF_DATA (partition 5)"
P_START=$(get_part 4 start) P_START=$(get_part 4 start)
P_SIZE=$(get_part 4 size) P_SIZE=$(get_part 4 size)
dd if=/dev/zero of="$WORK/out.img" bs=$SECTOR seek="$P_START" count="$P_SIZE" conv=notrunc status=none dd if=/dev/zero of="$WORK/out.img" bs=$SECTOR seek="$P_START" count="$P_SIZE" conv=notrunc status=none
# Create a standalone ext4 image, then dd it in
DATA_BYTES=$((P_SIZE * SECTOR))
truncate -s "$DATA_BYTES" "$WORK/data.ext4"
mkfs.ext4 -L BF_DATA -q "$WORK/data.ext4"
dd if="$WORK/data.ext4" of="$WORK/out.img" bs=$SECTOR seek="$P_START" conv=notrunc status=none
rm "$WORK/data.ext4"
echo "==> Final partition table" echo "==> Final partition table"
sfdisk -d "$WORK/out.img" sfdisk -d "$WORK/out.img"