From a299f6e6068814b0b1c2104bfbe9c05f022acd3e Mon Sep 17 00:00:00 2001 From: The MMGen Project Date: Sun, 19 Jan 2025 11:17:56 +0000 Subject: [PATCH] copy_boot_loader(): count sectors instead of blocks --- scripts/armbian_rootenc_setup.sh | 11 ++++++----- 1 file changed, 6 insertions(+), 5 deletions(-) diff --git a/scripts/armbian_rootenc_setup.sh b/scripts/armbian_rootenc_setup.sh index 5247912..4e21e73 100755 --- a/scripts/armbian_rootenc_setup.sh +++ b/scripts/armbian_rootenc_setup.sh @@ -820,12 +820,13 @@ create_partition_label() { } copy_boot_loader() { - local bs=4096 skip count - case $partition_table_type in 'dos') skip=0;; 'gpt') skip=8;; esac # LBA8 (0x8000): boot loader magic string - count=$((start_sector / 8 - $skip)) - pu_msg "Copying boot loader ($count 4K blocks [$((count*8)) sectors], starting at $skip blocks [$((skip*8)) sectors]):" + local skip count + # GPT bootloader starts at LBA 8 (0x8000, sector 64): + case $partition_table_type in 'dos') skip=0;; 'gpt') skip=64;; esac + count=$((start_sector - skip)) + pu_msg "Copying boot loader ($count sectors, starting at sector $skip [LBA $((skip / 8))]):" _show_output - dd if=$ARMBIAN_IMAGE of="/dev/$SDCARD_DEVNAME" status='progress' bs=$bs count=$count skip=$skip seek=$skip + dd if=$ARMBIAN_IMAGE of="/dev/$SDCARD_DEVNAME" status='progress' bs=512 count=$count skip=$skip seek=$skip _hide_output do_partprobe }