summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPaweł Owoc2025-02-24 12:18:46 +0000
committerRobert Marko2025-10-16 09:47:19 +0000
commit0c4f3b1246dae22d8cb299907fb200a212a4719a (patch)
treedeeed85899bc913d80867e203c2980a9e805cbae
parente301921ae383ebb81b33af59a802fb4ffdc14c0a (diff)
downloadopenwrt-0c4f3b1246dae22d8cb299907fb200a212a4719a.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: Paweł Owoc <frut3k7@gmail.com> Link: https://github.com/openwrt/openwrt/pull/20086 Signed-off-by: Robert Marko <robimarko@gmail.com>
-rw-r--r--target/linux/qualcommax/ipq807x/base-files/lib/upgrade/platform.sh9
1 files changed, 5 insertions, 4 deletions
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 438cfdc613..871f29e902 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() {
@@ -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)