qualcommax: fix upgrade function for Linksys MX dual boot devices

Function remove_oem_ubi_volume was called before CI_UBIPART variable was defined.

Fixes: https://github.com/openwrt/openwrt/commit/df1f6e1e186a99b2180abac5da87f071b7f6b3fa (qualcommax: ipq807x: Remove OEM UBI volume before upgrade for Linksys MX devices)
Signed-off-by: Paweł Owoc <[email protected]>
Link: https://github.com/openwrt/openwrt/pull/18090
Signed-off-by: Paweł Owoc <[email protected]>
Link: https://github.com/openwrt/openwrt/pull/20086
Signed-off-by: Robert Marko <[email protected]>

diff --git a/target/linux/qualcommax/ipq807x/base-files/lib/upgrade/platform.sh b/target/linux/qualcommax/ipq807x/base-files/lib/upgrade/platform.sh
index 438cfdc6133e7b7f481564dc1c5205c17b2c8f52..871f29e90294ddf2f6afc58fd513d9929e7b711a 100644 (file)
--- a/target/linux/qualcommax/ipq807x/base-files/lib/upgrade/platform.sh
+++ b/target/linux/qualcommax/ipq807x/base-files/lib/upgrade/platform.sh
@@ -108,7 +108,7 @@ tplink_do_upgrade() {
        nand_do_upgrade "$1"
 }
 
-linksys_mx_do_upgrade() {
+linksys_mx_pre_upgrade() {
        local setenv_script="/tmp/fw_env_upgrade"
 
        CI_UBIPART="rootfs"
@@ -144,7 +144,6 @@ linksys_mx_do_upgrade() {
                        return 1
                }
        fi
-       nand_do_upgrade "$1"
 }
 
 platform_check_image() {
@@ -213,13 +212,15 @@ platform_do_upgrade() {
        linksys,mx4200v1|\
        linksys,mx4200v2|\
        linksys,mx4300)
+               linksys_mx_pre_upgrade "$1"
                remove_oem_ubi_volume squashfs
-               linksys_mx_do_upgrade "$1"
+               nand_do_upgrade "$1"
                ;;
        linksys,mx5300|\
        linksys,mx8500)
+               linksys_mx_pre_upgrade "$1"
                remove_oem_ubi_volume ubifs
-               linksys_mx_do_upgrade "$1"
+               nand_do_upgrade "$1"
                ;;
        prpl,haze|\
        qnap,301w)