treewide: consolidate upgrade state set
Set the (sys)upgrade state when sourcing the stage2 script instead of setting the state for each target individual. This change fixes the, due to a missing state set, not working upgrade led on ath79 and apm821xx. Signed-off-by: Mathias Kresin <dev@kresin.me>
This commit is contained in:
parent
1ea1f3a223
commit
56b8ac1e86
6 changed files with 6 additions and 23 deletions
|
@ -211,6 +211,11 @@ jffs2_copy_config() {
|
|||
fi
|
||||
}
|
||||
|
||||
indicate_upgrade() {
|
||||
. /etc/diag.sh
|
||||
set_state upgrade
|
||||
}
|
||||
|
||||
# Flash firmware to MTD partition
|
||||
#
|
||||
# $(1): path to image
|
||||
|
|
|
@ -122,6 +122,7 @@ kill_remaining() { # [ <signal> [ <loop> ] ]
|
|||
echo
|
||||
}
|
||||
|
||||
indicate_upgrade
|
||||
|
||||
killall -9 telnetd
|
||||
killall -9 dropbear
|
||||
|
|
|
@ -83,9 +83,3 @@ platform_nand_pre_upgrade() {
|
|||
;;
|
||||
esac
|
||||
}
|
||||
|
||||
blink_led() {
|
||||
. /etc/diag.sh; set_state upgrade
|
||||
}
|
||||
|
||||
append sysupgrade_pre_upgrade blink_led
|
||||
|
|
|
@ -46,9 +46,3 @@ platform_nand_pre_upgrade() {
|
|||
;;
|
||||
esac
|
||||
}
|
||||
|
||||
blink_led() {
|
||||
. /etc/diag.sh; set_state upgrade
|
||||
}
|
||||
|
||||
append sysupgrade_pre_upgrade blink_led
|
||||
|
|
|
@ -49,8 +49,3 @@ platform_nand_pre_upgrade() {
|
|||
;;
|
||||
esac
|
||||
}
|
||||
|
||||
blink_led() {
|
||||
. /etc/diag.sh; set_state upgrade
|
||||
}
|
||||
append sysupgrade_pre_upgrade blink_led
|
||||
|
|
|
@ -367,9 +367,3 @@ platform_do_upgrade() {
|
|||
;;
|
||||
esac
|
||||
}
|
||||
|
||||
blink_led() {
|
||||
. /etc/diag.sh; set_state upgrade
|
||||
}
|
||||
|
||||
append sysupgrade_pre_upgrade blink_led
|
||||
|
|
Loading…
Reference in a new issue