diff options
| author | Paweł Owoc | 2025-02-24 12:18:46 +0000 |
|---|---|---|
| committer | Robert Marko | 2025-02-24 20:11:41 +0000 |
| commit | 7b401a9d955712d8ee0f969a2c235a7ce192434d (patch) | |
| tree | 15b062896febe27c4011be49fd399de380e74ba7 | |
| parent | 7a9a646c72b5c1ed0cbab931d209c8b9fa1a3803 (diff) | |
| download | openwrt-7b401a9d955712d8ee0f969a2c235a7ce192434d.tar.gz | |
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 <frut3k7@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/18090
Signed-off-by: Robert Marko <robimarko@gmail.com>
| -rw-r--r-- | target/linux/qualcommax/ipq50xx/base-files/lib/upgrade/platform.sh | 6 | ||||
| -rw-r--r-- | target/linux/qualcommax/ipq807x/base-files/lib/upgrade/platform.sh | 9 |
2 files changed, 8 insertions, 7 deletions
diff --git a/target/linux/qualcommax/ipq50xx/base-files/lib/upgrade/platform.sh b/target/linux/qualcommax/ipq50xx/base-files/lib/upgrade/platform.sh index bafbc7bbdb..aa71b8992e 100644 --- a/target/linux/qualcommax/ipq50xx/base-files/lib/upgrade/platform.sh +++ b/target/linux/qualcommax/ipq50xx/base-files/lib/upgrade/platform.sh @@ -27,7 +27,7 @@ remove_oem_ubi_volume() { fi } -linksys_mx_do_upgrade() { +linksys_mx_pre_upgrade() { local setenv_script="/tmp/fw_env_upgrade" CI_UBIPART="rootfs" @@ -63,7 +63,6 @@ linksys_mx_do_upgrade() { return 1 } fi - nand_do_upgrade "$1" } platform_check_image() { @@ -75,8 +74,9 @@ platform_do_upgrade() { linksys,mx2000|\ linksys,mx5500|\ linksys,spnmx56) + linksys_mx_pre_upgrade "$1" remove_oem_ubi_volume squashfs - linksys_mx_do_upgrade "$1" + nand_do_upgrade "$1" ;; *) default_do_upgrade "$1" 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 431491c141..ec8d0f58b0 100644 --- 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() { @@ -222,13 +221,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) |