From: Petr Štetiar <ynezz@true.cz>
Date: Mon, 13 May 2019 14:42:41 +0000 (+0200)
Subject: imx6: apalis: fix config survival after sysupgrade -n
X-Git-Tag: v19.07.0-rc1~590
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=2f1a11d0089c9d4b675b0e1e8806e1e8e3be5a02;p=oweals%2Fopenwrt.git

imx6: apalis: fix config survival after sysupgrade -n

This patch fixes `sysupgrade -n` when flashed with rootfs of the same
size as currently running, so the rootfs_data wouldn't get destroyed and
thus survive reboot. So let's fix it by always cleaning up the content
of the rootfs_data during sysupgrade.

Signed-off-by: Petr Štetiar <ynezz@true.cz>
---

diff --git a/target/linux/imx6/base-files/lib/upgrade/platform.sh b/target/linux/imx6/base-files/lib/upgrade/platform.sh
index 2d76b6b4af..c3be9d5424 100755
--- a/target/linux/imx6/base-files/lib/upgrade/platform.sh
+++ b/target/linux/imx6/base-files/lib/upgrade/platform.sh
@@ -72,3 +72,16 @@ platform_copy_config() {
 		;;
 	esac
 }
+
+platform_pre_upgrade() {
+	local board=$(board_name)
+
+	case "$board" in
+	apalis*)
+		[ "$SAVE_CONFIG" -eq 0 ] && {
+			jffs2reset -y
+			umount /overlay
+		}
+		;;
+	esac
+}