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 9871e62c617515cba91c502dd6718aa93e984711..81b349a81816033eef9df464b2a70fdb998e5a1d 100644 (file)
--- a/target/linux/x86/base-files/lib/upgrade/platform.sh
+++ b/target/linux/x86/base-files/lib/upgrade/platform.sh
@@ -1,29 +1,86 @@
-USE_REFRESH=1
-
 platform_check_image() {
-       [ "$ARGC" -gt 1 ] && return 1
+       local diskdev partdev diff
+       [ "$#" -gt 1 ] && return 1
 
        case "$(get_magic_word "$1")" in
-               eb48) return 0;;
+               eb48|eb63) ;;
                *)
                        echo "Invalid image type"
                        return 1
                ;;
        esac
+
+       export_bootdevice && export_partdevice diskdev 0 || {
+               echo "Unable to determine upgrade device"
+               return 1
+       }
+
+       get_partitions "/dev/$diskdev" bootdisk
+
+       #extract the boot sector from the image
+       get_image "$@" | dd of=/tmp/image.bs count=1 bs=512b 2>/dev/null
+
+       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
+               echo "Partition layout has changed. Full image will be written."
+               ask_bool 0 "Abort" && exit 1
+               return 0
+       fi
 }
 
-platform_do_upgrade() {
-       sync
-       get_image "$1" > /dev/sda
+platform_copy_config() {
+       local partdev
+
+       if export_partdevice partdev 1; then
+               mount -t ext4 -o rw,noatime "/dev/$partdev" /mnt
+               cp -af "$CONF_TAR" /mnt/
+               umount /mnt
+       fi
 }
 
-x86_prepare_ext2() {
-       # if we're running from ext2, we need to make sure that we have a mtd 
-       # partition that points to the active rootfs partition.
-       # however this only matters if we actually need to preserve the config files
-       [ "$SAVE_CONFIG" -eq 1 ] || return 0
-       grep rootfs /proc/mtd >/dev/null || {
-               echo /dev/hda2,65536,rootfs > /sys/module/block2mtd/parameters/block2mtd
-       }
+platform_do_upgrade() {
+       local diskdev partdev diff
+
+       if export_bootdevice && export_partdevice diskdev 0; then
+               sync
+               if [ "$SAVE_PARTITIONS" = "1" ]; then
+                       get_partitions "/dev/$diskdev" bootdisk
+
+                       #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
+                               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
+                               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 /dev/$diskdev..."
+                       get_image "$@" | dd of="/dev/$diskdev" bs=1 skip=440 count=4 seek=440 conv=fsync
+               else
+                       get_image "$@" | dd of="/dev/$diskdev" bs=4096 conv=fsync
+               fi
+
+               sleep 1
+       fi
 }
-append sysupgrade_pre_upgrade x86_prepare_ext2