x86: fix grub-bios-setup fail during sysupgrade

[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 8be96dfcd45f7a85e11683c1d4a218e1c4680719..829834471d301e8b6eac5b5d25b91bd96e8c7824 100644 (file)
--- a/target/linux/x86/base-files/lib/upgrade/platform.sh
+++ b/target/linux/x86/base-files/lib/upgrade/platform.sh
@@ -20,7 +20,7 @@ platform_check_image() {
        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_image "$@" | dd of=/tmp/image.bs count=63 bs=512b 2>/dev/null
 
        get_partitions /tmp/image.bs image
 
@@ -37,30 +37,33 @@ platform_check_image() {
 }
 
 platform_copy_config() {
-       local partdev
+       local partdev parttype=ext4
 
        if export_partdevice partdev 1; then
-               mount -t ext4 -o rw,noatime "/dev/$partdev" /mnt
+               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
 }
 
 platform_do_bootloader_upgrade() {
-       local bootpart
+       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
 
                echo "Upgrading bootloader on /dev/$diskdev..."
                grub-bios-setup \
                        -m "/tmp/device.map" \
                        -d "/tmp/boot/boot/grub" \
-                       -r "hd0,msdos1" \
-                       "/dev/$diskdev"
+                       -r "hd0,${parttable}1" \
+                       "/dev/$diskdev" \
+               && touch /tmp/boot/grub/upgraded
 
                umount /tmp/boot
        fi
@@ -80,7 +83,7 @@ platform_do_upgrade() {
                get_partitions "/dev/$diskdev" bootdisk
 
                #extract the boot sector from the image
-               get_image "$@" | dd of=/tmp/image.bs count=1 bs=512b
+               get_image "$@" | dd of=/tmp/image.bs count=63 bs=512b >/dev/null
 
                get_partitions /tmp/image.bs image
 
@@ -105,7 +108,7 @@ platform_do_upgrade() {
        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
+                       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
@@ -116,4 +119,15 @@ platform_do_upgrade() {
        get_image "$@" | dd 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
+
 }