-platform_export_bootpart() {
- local cmdline uuid disk
-
- if read cmdline < /proc/cmdline; then
- case "$cmdline" in
- *block2mtd=*)
- disk="${cmdline##*block2mtd=}"
- disk="${disk%%,*}"
- ;;
- *root=*)
- disk="${cmdline##*root=}"
- disk="${disk%% *}"
- ;;
- esac
-
- case "$disk" in
- PARTUUID=[a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9][a-f0-9]-02)
- uuid="${disk#PARTUUID=}"
- uuid="${uuid%-02}"
- for disk in /dev/*; do
- [ -b "$disk" ] || continue
- set -- $(dd if=$disk bs=1 skip=440 count=4 2>/dev/null | hexdump -v -e '4/1 "%02x "')
- if [ "$4$3$2$1" = "$uuid" ]; then
- export BOOTPART="${disk}1"
- return 0
- fi
- done
- ;;
- /dev/*)
- export BOOTPART="${disk%[0-9]}1"
- return 0
- ;;
- esac
- fi
-
- return 1
-}
+RAMFS_COPY_BIN='grub-bios-setup'
platform_check_image() {
+ local diskdev partdev diff
[ "$#" -gt 1 ] && return 1
case "$(get_magic_word "$1")" in
- eb48|eb63) return 0;;
+ eb48|eb63) ;;
*)
- echo "Invalid image type"
+ v "Invalid image type"
return 1
;;
esac
+
+ export_bootdevice && export_partdevice diskdev 0 || {
+ v "Unable to determine upgrade device"
+ return 1
+ }
+
+ get_partitions "/dev/$diskdev" bootdisk
+
+ v "Extract boot sector from the image"
+ get_image_dd "$1" of=/tmp/image.bs count=63 bs=512b
+
+ get_partitions /tmp/image.bs image
+
+ #compare tables
+ diff="$(grep -F -x -v -f /tmp/partmap.bootdisk /tmp/partmap.image)"
+
+ rm -f /tmp/image.bs /tmp/partmap.bootdisk /tmp/partmap.image
+
+ if [ -n "$diff" ]; then
+ v "Partition layout has changed. Full image will be written."
+ ask_bool 0 "Abort" && exit 1
+ return 0
+ fi
}
platform_copy_config() {
- if [ -b "$BOOTPART" ]; then
- mount -t ext4 -o rw,noatime "$BOOTPART" /mnt
- cp -af "$CONF_TAR" /mnt/
+ local partdev parttype=ext4
+
+ if export_partdevice partdev 1; then
+ part_magic_fat "/dev/$partdev" && parttype=vfat
+ mount -t $parttype -o rw,noatime "/dev/$partdev" /mnt
+ cp -af "$UPGRADE_BACKUP" "/mnt/$BACKUP_FILE"
umount /mnt
fi
}
-get_partitions() { # <device> <filename>
- local disk="$1"
- local filename="$2"
+platform_do_bootloader_upgrade() {
+ local bootpart parttable=msdos
+ local diskdev="$1"
+
+ if export_partdevice bootpart 1; then
+ mkdir -p /tmp/boot
+ mount -o rw,noatime "/dev/$bootpart" /tmp/boot
+ echo "(hd0) /dev/$diskdev" > /tmp/device.map
+ part_magic_efi "/dev/$diskdev" && parttable=gpt
+
+ v "Upgrading bootloader on /dev/$diskdev..."
+ grub-bios-setup \
+ -m "/tmp/device.map" \
+ -d "/tmp/boot/boot/grub" \
+ -r "hd0,${parttable}1" \
+ "/dev/$diskdev" \
+ && touch /tmp/boot/boot/grub/upgraded
+
+ umount /tmp/boot
+ fi
+}
- if [ -b "$disk" -o -f "$disk" ]; then
- echo "Reading partition table from $filename..."
+platform_do_upgrade() {
+ local diskdev partdev diff
- local magic="$(hexdump -v -n 2 -s 0x1FE -e '1/2 "0x%04X"' "$disk")"
- if [ "$magic" != 0xAA55 ]; then
- echo "Invalid partition table on $disk"
- exit
- fi
+ export_bootdevice && export_partdevice diskdev 0 || {
+ v "Unable to determine upgrade device"
+ return 1
+ }
- rm -f "/tmp/partmap.$filename"
+ sync
- local part
- for part in 1 2 3 4; do
- set -- $(hexdump -v -n 12 -s "$((0x1B2 + $part * 16))" -e '3/4 "0x%08X "' "$disk")
+ if [ "$UPGRADE_OPT_SAVE_PARTITIONS" = "1" ]; then
+ get_partitions "/dev/$diskdev" bootdisk
- local type="$(($1 % 256))"
- local lba="$(($2))"
- local num="$(($3))"
+ v "Extract boot sector from the image"
+ get_image_dd "$1" of=/tmp/image.bs count=63 bs=512b
- [ $type -gt 0 ] || continue
+ get_partitions /tmp/image.bs image
- printf "%2d %5d %7d\n" $part $lba $num >> "/tmp/partmap.$filename"
- done
+ #compare tables
+ diff="$(grep -F -x -v -f /tmp/partmap.bootdisk /tmp/partmap.image)"
+ else
+ diff=1
fi
-}
-platform_do_upgrade() {
- platform_export_bootpart
- disk="${BOOTPART%[0-9]}"
-
- if [ -b "$disk" ]; then
- sync
- if [ "$SAVE_PARTITIONS" = "1" ]; then
- get_partitions "$disk" bootdisk
-
-
- #get block size
- if [ -f "/sys/block/${disk##*/}/queue/physical_block_size" ]; then
- ibs="$(cat "/sys/block/${disk##*/}/queue/physical_block_size")"
- else
- ibs=512
- fi
-
- #extract the boot sector from the image
- get_image "$@" | dd of=/tmp/image.bs count=1 bs=512b
-
- get_partitions /tmp/image.bs image
-
- #compare tables
- diff="$(grep -F -x -v -f /tmp/partmap.bootdisk /tmp/partmap.image)"
- if [ -n "$diff" ]; then
- echo "Partition layout is changed. Full image will be written."
- ask_bool 0 "Abort" && exit
-
- get_image "$@" | dd of="$disk" bs=4096 conv=fsync
- return 0
- fi
-
- #iterate over each partition from the image and write it to the boot disk
- while read part start size; do
- echo "Writing image to $disk$part..."
- get_image "$@" | dd of="$disk$part" ibs="$ibs" obs=1M skip="$start" count="$size" conv=fsync
- done < /tmp/partmap.image
-
- #copy partition uuid
- echo "Writing new UUID to $disk$part..."
- get_image "$@" | dd of="$disk" bs=1 skip=440 count=4 seek=440 conv=fsync
+ if [ -n "$diff" ]; then
+ get_image_dd "$1" of="/dev/$diskdev" bs=4096 conv=fsync
+
+ # Separate removal and addtion is necessary; otherwise, partition 1
+ # will be missing if it overlaps with the old partition 2
+ partx -d - "/dev/$diskdev"
+ partx -a - "/dev/$diskdev"
+
+ return 0
+ fi
+
+ #iterate over each partition from the image and write it to the boot disk
+ while read part start size; do
+ if export_partdevice partdev $part; then
+ v "Writing image to /dev/$partdev..."
+ get_image_dd "$1" of="/dev/$partdev" ibs=512 obs=1M skip="$start" count="$size" conv=fsync
else
- get_image "$@" | dd of="$disk" bs=4096 conv=fsync
+ v "Unable to find partition $part device, skipped."
fi
+ done < /tmp/partmap.image
- sleep 1
+ v "Writing new UUID to /dev/$diskdev..."
+ get_image_dd "$1" of="/dev/$diskdev" bs=1 skip=440 count=4 seek=440 conv=fsync
+
+ platform_do_bootloader_upgrade "$diskdev"
+ local parttype=ext4
+ part_magic_efi "/dev/$diskdev" || return 0
+
+ if export_partdevice partdev 1; then
+ part_magic_fat "/dev/$partdev" && parttype=vfat
+ mount -t $parttype -o rw,noatime "/dev/$partdev" /mnt
+ set -- $(dd if="/dev/$diskdev" bs=1 skip=1168 count=16 2>/dev/null | hexdump -v -e '8/1 "%02x "" "2/1 "%02x""-"6/1 "%02x"')
+ sed -i "s/\(PARTUUID=\)[a-f0-9-]\+/\1$4$3$2$1-$6$5-$8$7-$9/ig" /mnt/boot/grub/grub.cfg
+ umount /mnt
fi
}
projects / openwrt / openwrt.git / blobdiff