From: Daniel Golle Date: Sun, 30 Oct 2022 20:22:06 +0000 (+0000) Subject: base-files: bring back nand_do_upgrade_success X-Git-Tag: v23.05.0-rc1~1936 X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fopenwrt.git;a=commitdiff_plain;h=84ff6c90dda1bef517675c50397d3080cdd3c6c2 base-files: bring back nand_do_upgrade_success Several Broadcom targets were using the nand_do_upgrade_success shell function which has been removed by commit e25e6d8e54 ("base-files: fix and clean up nand sysupgrade code"). Refactor the new nand_do_upgrade to bring back nand_do_upgrade_success with the behavior expected by those users. Fixes: e25e6d8e54 ("base-files: fix and clean up nand sysupgrade code") Reported-by: Chen Minqiang Signed-off-by: Daniel Golle --- diff --git a/package/base-files/files/lib/upgrade/nand.sh b/package/base-files/files/lib/upgrade/nand.sh index d9cfeede9c..1019b9927c 100644 --- a/package/base-files/files/lib/upgrade/nand.sh +++ b/package/base-files/files/lib/upgrade/nand.sh @@ -418,12 +418,20 @@ nand_do_upgrade() { local file="$1" sync - if nand_do_flash_file "$file" && nand_do_restore_config && sync; then + nand_do_flash_file "$file" && nand_do_upgrade_success + nand_do_upgrade_failed +} + +nand_do_upgrade_success() { + if nand_do_restore_config && sync; then echo "sysupgrade successful" umount -a reboot -f fi + nand_do_upgrade_failed +} +nand_do_upgrade_failed() { sync echo "sysupgrade failed" # Should we reboot or bring up some failsafe mode instead?