aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--package/base-files/files/lib/upgrade/common.sh5
-rwxr-xr-xpackage/base-files/files/lib/upgrade/stage21
-rw-r--r--target/linux/ipq40xx/base-files/lib/upgrade/platform.sh6
-rw-r--r--target/linux/ipq806x/base-files/lib/upgrade/platform.sh6
-rwxr-xr-xtarget/linux/pistachio/base-files/lib/upgrade/platform.sh5
-rwxr-xr-xtarget/linux/ramips/base-files/lib/upgrade/platform.sh6
6 files changed, 6 insertions, 23 deletions
diff --git a/package/base-files/files/lib/upgrade/common.sh b/package/base-files/files/lib/upgrade/common.sh
index 0cbd2ab3a6..9e9144cba4 100644
--- a/package/base-files/files/lib/upgrade/common.sh
+++ b/package/base-files/files/lib/upgrade/common.sh
@@ -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
diff --git a/package/base-files/files/lib/upgrade/stage2 b/package/base-files/files/lib/upgrade/stage2
index 3985d8fd7e..bdc12c7426 100755
--- a/package/base-files/files/lib/upgrade/stage2
+++ b/package/base-files/files/lib/upgrade/stage2
@@ -122,6 +122,7 @@ kill_remaining() { # [ <signal> [ <loop> ] ]
echo
}
+indicate_upgrade
killall -9 telnetd
killall -9 dropbear
diff --git a/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh b/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh
index 0e29302465..610f9bbbdb 100644
--- a/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh
+++ b/target/linux/ipq40xx/base-files/lib/upgrade/platform.sh
@@ -83,9 +83,3 @@ platform_nand_pre_upgrade() {
;;
esac
}
-
-blink_led() {
- . /etc/diag.sh; set_state upgrade
-}
-
-append sysupgrade_pre_upgrade blink_led
diff --git a/target/linux/ipq806x/base-files/lib/upgrade/platform.sh b/target/linux/ipq806x/base-files/lib/upgrade/platform.sh
index b41bea1c29..6e282f99f4 100644
--- a/target/linux/ipq806x/base-files/lib/upgrade/platform.sh
+++ b/target/linux/ipq806x/base-files/lib/upgrade/platform.sh
@@ -46,9 +46,3 @@ platform_nand_pre_upgrade() {
;;
esac
}
-
-blink_led() {
- . /etc/diag.sh; set_state upgrade
-}
-
-append sysupgrade_pre_upgrade blink_led
diff --git a/target/linux/pistachio/base-files/lib/upgrade/platform.sh b/target/linux/pistachio/base-files/lib/upgrade/platform.sh
index d7d2ba065a..4de019a27c 100755
--- a/target/linux/pistachio/base-files/lib/upgrade/platform.sh
+++ b/target/linux/pistachio/base-files/lib/upgrade/platform.sh
@@ -49,8 +49,3 @@ platform_nand_pre_upgrade() {
;;
esac
}
-
-blink_led() {
- . /etc/diag.sh; set_state upgrade
-}
-append sysupgrade_pre_upgrade blink_led
diff --git a/target/linux/ramips/base-files/lib/upgrade/platform.sh b/target/linux/ramips/base-files/lib/upgrade/platform.sh
index 67c032cb8a..78b75d4648 100755
--- a/target/linux/ramips/base-files/lib/upgrade/platform.sh
+++ b/target/linux/ramips/base-files/lib/upgrade/platform.sh
@@ -367,9 +367,3 @@ platform_do_upgrade() {
;;
esac
}
-
-blink_led() {
- . /etc/diag.sh; set_state upgrade
-}
-
-append sysupgrade_pre_upgrade blink_led