Browse Source

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 <[email protected]>
Mathias Kresin 7 years ago
parent
commit
56b8ac1e86

+ 5 - 0
package/base-files/files/lib/upgrade/common.sh

@@ -211,6 +211,11 @@ jffs2_copy_config() {
 	fi
 	fi
 }
 }
 
 
+indicate_upgrade() {
+	. /etc/diag.sh
+	set_state upgrade
+}
+
 # Flash firmware to MTD partition
 # Flash firmware to MTD partition
 #
 #
 # $(1): path to image
 # $(1): path to image

+ 1 - 0
package/base-files/files/lib/upgrade/stage2

@@ -122,6 +122,7 @@ kill_remaining() { # [ <signal> [ <loop> ] ]
 	echo
 	echo
 }
 }
 
 
+indicate_upgrade
 
 
 killall -9 telnetd
 killall -9 telnetd
 killall -9 dropbear
 killall -9 dropbear

+ 0 - 6
target/linux/ipq40xx/base-files/lib/upgrade/platform.sh

@@ -83,9 +83,3 @@ platform_nand_pre_upgrade() {
 		;;
 		;;
 	esac
 	esac
 }
 }
-
-blink_led() {
-	. /etc/diag.sh; set_state upgrade
-}
-
-append sysupgrade_pre_upgrade blink_led

+ 0 - 6
target/linux/ipq806x/base-files/lib/upgrade/platform.sh

@@ -46,9 +46,3 @@ platform_nand_pre_upgrade() {
 		;;
 		;;
 	esac
 	esac
 }
 }
-
-blink_led() {
-	. /etc/diag.sh; set_state upgrade
-}
-
-append sysupgrade_pre_upgrade blink_led

+ 0 - 5
target/linux/pistachio/base-files/lib/upgrade/platform.sh

@@ -49,8 +49,3 @@ platform_nand_pre_upgrade() {
 		;;
 		;;
 	esac
 	esac
 }
 }
-
-blink_led() {
-	. /etc/diag.sh; set_state upgrade
-}
-append sysupgrade_pre_upgrade blink_led

+ 0 - 6
target/linux/ramips/base-files/lib/upgrade/platform.sh

@@ -367,9 +367,3 @@ platform_do_upgrade() {
 		;;
 		;;
 	esac
 	esac
 }
 }
-
-blink_led() {
-	. /etc/diag.sh; set_state upgrade
-}
-
-append sysupgrade_pre_upgrade blink_led