base-files: fix Linksys upgrade, restore config step

[openwrt/openwrt.git] / target / linux / ipq806x / base-files / lib / upgrade / linksys.sh

diff --git a/target/linux/ipq806x/base-files/lib/upgrade/linksys.sh b/target/linux/ipq806x/base-files/lib/upgrade/linksys.sh
index 0234ce0a51a0a92dcd719102f83e19686442574a..21d22c6f1bc40ad35dea7f6f5700e09600060a65 100644 (file)
--- a/target/linux/ipq806x/base-files/lib/upgrade/linksys.sh
+++ b/target/linux/ipq806x/base-files/lib/upgrade/linksys.sh
@@ -3,32 +3,45 @@
 #
 
 linksys_get_target_firmware() {
-       cur_boot_part=`/usr/sbin/fw_printenv -n boot_part`
-       target_firmware=""
-       if [ "$cur_boot_part" = "1" ]
-       then
-               # current primary boot - update alt boot
-               target_firmware="kernel2"
-               fw_setenv boot_part 2
-               #In EA8500 bootcmd is always "bootipq", so don't change
-               #fw_setenv bootcmd "run altnandboot"
-       elif [ "$cur_boot_part" = "2" ]
-       then
-               # current alt boot - update primary boot
-               target_firmware="kernel1"
-               fw_setenv boot_part 1
-               #In EA8500 bootcmd is always "bootipq", so don't change
-               #fw_setenv bootcmd "run nandboot"
-       fi
-
-       # re-enable recovery so we get back if the new firmware is broken
-       fw_setenv auto_recovery yes
 
-       echo "$target_firmware"
-}
+       local cur_boot_part mtd_ubi0
+
+       cur_boot_part=$(/usr/sbin/fw_printenv -n boot_part)
+       if [ -z "${cur_boot_part}" ] ; then
+               mtd_ubi0=$(cat /sys/class/ubi/ubi0/mtd_num)
+               case $(grep -E ^mtd${mtd_ubi0}: /proc/mtd | cut -d '"' -f 2) in
+               kernel1|rootfs1)
+                       cur_boot_part=1
+                       ;;
+               kernel2|rootfs2)
+                       cur_boot_part=2
+                       ;;
+               esac
+               >&2 printf "Current boot_part='%s' selected from ubi0/mtd_num='%s'" \
+                       "${cur_boot_part}" "${mtd_ubi0}"
+       fi
 
-linksys_get_root_magic() {
-       (get_image "$@" | dd skip=786432 bs=4 count=1 | hexdump -v -n 4 -e '1/1 "%02x"') 2>/dev/null
+       case $cur_boot_part in
+       1)
+               fw_setenv -s - <<-EOF
+                       boot_part 2
+                       auto_recovery yes
+               EOF
+               printf "kernel2"
+               return
+               ;;
+       2)
+               fw_setenv -s - <<-EOF
+                       boot_part 1
+                       auto_recovery yes
+               EOF
+               printf "kernel1"
+               return
+               ;;
+       *)
+               return
+               ;;
+       esac
 }
 
 platform_do_upgrade_linksys() {
@@ -81,21 +94,14 @@ platform_do_upgrade_linksys() {
 
 
                # complete std upgrade
-               nand_upgrade_tar "$1"
-       }
-       [ "$magic_long" = "27051956" ] && {
-               # check firmwares' rootfs types
-               local oldroot="$(linksys_get_root_magic $target_mtd)"
-               local newroot="$(linksys_get_root_magic "$1")"
-
-               if [ "$newroot" = "55424923" -a "$oldroot" = "55424923" ]
-               # we're upgrading from a firmware with UBI to one with UBI
-               then
-                       # erase everything to be safe
-                       mtd erase $part_label
-                       get_image "$1" | mtd -n write - $part_label
+               if nand_upgrade_tar "$1" ; then
+                       nand_do_upgrade_success
                else
-                       get_image "$1" | mtd write - $part_label
+                       nand_do_upgrade_failed
                fi
+
+       }
+       [ "$magic_long" = "27051956" ] && {
+               get_image "$1" | mtd write - $part_label
        }
 }