qualcommax: ipq807x: Remove OEM UBI volume before upgrade for Linksys MX devices

Use 'remove_oem_ubi_volume' function to remove OEM UBI volume before upgrade.
This allows to upgrade even if we have OEM firmware on the second partition.
Applies to Linksys MX4200/MX4300/MX5300/MX8500.

Signed-off-by: Paweł Owoc <frut3k7@gmail.com>
Link: https://github.com/openwrt/openwrt/pull/14720
Link: https://github.com/openwrt/openwrt/pull/20086
Signed-off-by: Robert Marko <robimarko@gmail.com>

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 3deb102a8fa9248627f3e8e71a32707f62f8be80..438cfdc6133e7b7f481564dc1c5205c17b2c8f52 100644 (file)
--- a/target/linux/qualcommax/ipq807x/base-files/lib/upgrade/platform.sh
+++ b/target/linux/qualcommax/ipq807x/base-files/lib/upgrade/platform.sh
@@ -212,9 +212,13 @@ platform_do_upgrade() {
                ;;
        linksys,mx4200v1|\
        linksys,mx4200v2|\
-       linksys,mx4300|\
+       linksys,mx4300)
+               remove_oem_ubi_volume squashfs
+               linksys_mx_do_upgrade "$1"
+               ;;
        linksys,mx5300|\
        linksys,mx8500)
+               remove_oem_ubi_volume ubifs
                linksys_mx_do_upgrade "$1"
                ;;
        prpl,haze|\