From: Rafał Miłecki <ra...@milecki.pl> The only step between platform_pre_upgrade() and platform_do_upgrade() is switching to ramdisk. It should be fine to "mtd erase firmware" from the later callback and get rid of the first one.
Signed-off-by: Rafał Miłecki <ra...@milecki.pl> --- .../ramips/base-files/lib/upgrade/platform.sh | 20 ++++++++----------- 1 file changed, 8 insertions(+), 12 deletions(-) diff --git a/target/linux/ramips/base-files/lib/upgrade/platform.sh b/target/linux/ramips/base-files/lib/upgrade/platform.sh index c71ffc0321..4eaaffe029 100755 --- a/target/linux/ramips/base-files/lib/upgrade/platform.sh +++ b/target/linux/ramips/base-files/lib/upgrade/platform.sh @@ -9,18 +9,6 @@ platform_check_image() { return 0 } -platform_pre_upgrade() { - local board=$(board_name) - - case "$board" in - mikrotik,rb750gr3|\ - mikrotik,rbm11g|\ - mikrotik,rbm33g) - [ -z "$(rootfs_type)" ] && mtd erase firmware - ;; - esac -} - platform_nand_pre_upgrade() { local board=$(board_name) @@ -35,6 +23,14 @@ platform_nand_pre_upgrade() { platform_do_upgrade() { local board=$(board_name) + case "$board" in + mikrotik,rb750gr3|\ + mikrotik,rbm11g|\ + mikrotik,rbm33g) + [ -z "$(rootfs_type)" ] && mtd erase firmware + ;; + esac + case "$board" in hiwifi,hc5962|\ netgear,r6220|\ -- 2.21.0 _______________________________________________ openwrt-devel mailing list openwrt-devel@lists.openwrt.org https://lists.openwrt.org/mailman/listinfo/openwrt-devel