x86: sysupgrade: move partition table change check to platform_check_image

[openwrt/openwrt.git] / target / linux / x86 / base-files / lib / upgrade / platform.sh

diff --git a/target/linux/x86/base-files/lib/upgrade/platform.sh b/target/linux/x86/base-files/lib/upgrade/platform.sh
index 29eac77dfb0ae52f241696f3f62dce7d16106b20..81b349a81816033eef9df464b2a70fdb998e5a1d 100644 (file)
--- a/target/linux/x86/base-files/lib/upgrade/platform.sh
+++ b/target/linux/x86/base-files/lib/upgrade/platform.sh
@@ -1,107 +1,56 @@
-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
-}
-
 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"
                        return 1
                ;;
        esac
-}
 
-platform_copy_config() {
-       if [ -b "$BOOTPART" ]; then
-               mount -t ext4 -o rw,noatime "$BOOTPART" /mnt
-               cp -af "$CONF_TAR" /mnt/
-               umount /mnt
-       fi
-}
+       export_bootdevice && export_partdevice diskdev 0 || {
+               echo "Unable to determine upgrade device"
+               return 1
+       }
 
-get_partitions() { # <device> <filename>
-       local disk="$1"
-       local filename="$2"
+       get_partitions "/dev/$diskdev" bootdisk
 
-       if [ -b "$disk" -o -f "$disk" ]; then
-               echo "Reading partition table from $filename..."
+       #extract the boot sector from the image
+       get_image "$@" | dd of=/tmp/image.bs count=1 bs=512b 2>/dev/null
 
-               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
+       get_partitions /tmp/image.bs image
 
-               rm -f "/tmp/partmap.$filename"
+       #compare tables
+       diff="$(grep -F -x -v -f /tmp/partmap.bootdisk /tmp/partmap.image)"
 
-               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")
+       rm -f /tmp/image.bs /tmp/partmap.bootdisk /tmp/partmap.image
 
-                       local type="$(($1 % 256))"
-                       local lba="$(($2))"
-                       local num="$(($3))"
+       if [ -n "$diff" ]; then
+               echo "Partition layout has changed. Full image will be written."
+               ask_bool 0 "Abort" && exit 1
+               return 0
+       fi
+}
 
-                       [ $type -gt 0 ] || continue
+platform_copy_config() {
+       local partdev
 
-                       printf "%2d %5d %7d\n" $part $lba $num >> "/tmp/partmap.$filename"
-               done
+       if export_partdevice partdev 1; then
+               mount -t ext4 -o rw,noatime "/dev/$partdev" /mnt
+               cp -af "$CONF_TAR" /mnt/
+               umount /mnt
        fi
 }
 
 platform_do_upgrade() {
-       platform_export_bootpart
-       disk="${BOOTPART%[0-9]}"
+       local diskdev partdev diff
 
-       if [ -b "$disk" ]; then
+       if export_bootdevice && export_partdevice diskdev 0; 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
+                       get_partitions "/dev/$diskdev" bootdisk
 
                        #extract the boot sector from the image
                        get_image "$@" | dd of=/tmp/image.bs count=1 bs=512b
@@ -111,24 +60,25 @@ platform_do_upgrade() {
                        #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
+                               get_image "$@" | dd of="/dev/$diskdev" 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
+                               if export_partdevice partdev $part; then
+                                       echo "Writing image to /dev/$partdev..."
+                                       get_image "$@" | dd of="/dev/$partdev" ibs="512" obs=1M skip="$start" count="$size" conv=fsync
+                               else
+                                       echo "Unable to find partition $part device, skipped."
+                               fi
                        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
+                       echo "Writing new UUID to /dev/$diskdev..."
+                       get_image "$@" | dd of="/dev/$diskdev" bs=1 skip=440 count=4 seek=440 conv=fsync
                else
-                       get_image "$@" | dd of="$disk" bs=4096 conv=fsync
+                       get_image "$@" | dd of="/dev/$diskdev" bs=4096 conv=fsync
                fi
 
                sleep 1