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 <[email protected]>
Link: https://github.com/openwrt/openwrt/pull/14720
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 1bc71efdb50f0a31f666279966f47698a6c85408..cb60c5daf61fb6f31e46977624211f0a4f5dc53e 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|\