Skip to content

Commit

Permalink
kirkwood: fix Linksys upgrade, restore config step
Browse files Browse the repository at this point in the history
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: e25e6d8 ("base-files: fix and clean up nand sysupgrade code")
Fixes: #12298
Signed-off-by: Michael Trinidad <trinidude4@hotmail.com>
  • Loading branch information
trinidude4 authored and hauke committed Apr 11, 2023
1 parent 9cbc837 commit 65f8089
Showing 1 changed file with 6 additions and 1 deletion.
7 changes: 6 additions & 1 deletion target/linux/kirkwood/base-files/lib/upgrade/linksys.sh
Expand Up @@ -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
Expand Down

0 comments on commit 65f8089

Please sign in to comment.