From: Michael Trinidad Date: Sat, 1 Apr 2023 19:04:02 +0000 (-0400) Subject: kirkwood: fix Linksys upgrade, restore config step X-Git-Tag: v23.05.0-rc1~520 X-Git-Url: http://git.openwrt.org/?a=commitdiff_plain;h=65f8089b7ada050c876064957db949c931b76358;p=openwrt%2Fstaging%2Fhauke.git kirkwood: fix Linksys upgrade, restore config step It appears that the refactor of the upgrade process for NAND devices resulted in the nand_do_upgrade_success step not being called for devices using the linksys.sh script. As a result, configuration was not preserved over sysupgrade steps. This restores the preservation of configs for kirkwood devices using the linksys.sh script. Fixes: e25e6d8e5407 ("base-files: fix and clean up nand sysupgrade code") Fixes: #12298 Signed-off-by: Michael Trinidad --- diff --git a/target/linux/kirkwood/base-files/lib/upgrade/linksys.sh b/target/linux/kirkwood/base-files/lib/upgrade/linksys.sh index 9067f00e1a..207a65d713 100644 --- a/target/linux/kirkwood/base-files/lib/upgrade/linksys.sh +++ b/target/linux/kirkwood/base-files/lib/upgrade/linksys.sh @@ -68,7 +68,12 @@ platform_do_upgrade_linksys() { CI_UBIPART="rootfs2" fi - nand_upgrade_tar "$1" + if nand_upgrade_tar "$1" ; then + nand_do_upgrade_success + else + nand_do_upgrade_failed + fi + } [ "$magic_long" = "27051956" ] && { get_image "$1" | mtd write - $part_label