summaryrefslogtreecommitdiffstats
path: root/package/base-files/files
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2014-12-15 10:37:00 +0000
committerJohn Crispin <john@openwrt.org>2014-12-15 10:37:00 +0000
commit019ea725aad8481c34aaa8b7561c3f9ba6d79e1d (patch)
tree21b1f4bb215895cc20de6c7833b6e17dfd143cf5 /package/base-files/files
parenta5b6b7e41943fec0eb28593ce92b0713990c8d23 (diff)
downloadmaster-31e0f0ae-019ea725aad8481c34aaa8b7561c3f9ba6d79e1d.tar.gz
master-31e0f0ae-019ea725aad8481c34aaa8b7561c3f9ba6d79e1d.tar.bz2
master-31e0f0ae-019ea725aad8481c34aaa8b7561c3f9ba6d79e1d.zip
add "preinit_regular" diag.sh set_state argument
This new argument is used right after starting regular preinit (which happens if failsafe wasn't triggered). The main purpose of "preinit" argument is to indicate that failsafe can be triggered, however we were missing a way to inform user that we don't wait for a trigger anymore. With this change it's clear when failsafe mode can be triggered. Signed-off-by: Rafał Miłecki <zajec5@gmail.com> SVN-Revision: 43715
Diffstat (limited to 'package/base-files/files')
-rw-r--r--package/base-files/files/lib/functions/leds.sh4
-rw-r--r--package/base-files/files/lib/preinit/10_indicate_preinit6
-rw-r--r--package/base-files/files/lib/preinit/50_indicate_regular_preinit2
3 files changed, 6 insertions, 6 deletions
diff --git a/package/base-files/files/lib/functions/leds.sh b/package/base-files/files/lib/functions/leds.sh
index 743c7da782..4ac81455fa 100644
--- a/package/base-files/files/lib/functions/leds.sh
+++ b/package/base-files/files/lib/functions/leds.sh
@@ -66,3 +66,7 @@ status_led_blink_preinit() {
status_led_blink_failsafe() {
led_timer $status_led 50 50
}
+
+status_led_blink_preinit_regular() {
+ led_timer $status_led 500 500
+}
diff --git a/package/base-files/files/lib/preinit/10_indicate_preinit b/package/base-files/files/lib/preinit/10_indicate_preinit
index 900911606a..8e94df9ab2 100644
--- a/package/base-files/files/lib/preinit/10_indicate_preinit
+++ b/package/base-files/files/lib/preinit/10_indicate_preinit
@@ -36,13 +36,9 @@ preinit_echo() {
echo $1
}
-pi_indicate_led() {
- set_state preinit
-}
-
pi_indicate_preinit() {
preinit_net_echo "Doing OpenWrt Preinit\n"
- pi_indicate_led
+ set_state preinit
}
boot_hook_add preinit_main preinit_ip
diff --git a/package/base-files/files/lib/preinit/50_indicate_regular_preinit b/package/base-files/files/lib/preinit/50_indicate_regular_preinit
index bc223b358e..5b7523f6fd 100644
--- a/package/base-files/files/lib/preinit/50_indicate_regular_preinit
+++ b/package/base-files/files/lib/preinit/50_indicate_regular_preinit
@@ -4,7 +4,7 @@
indicate_regular_preinit() {
preinit_net_echo "Continuing with Regular Preinit\n"
- pi_indicate_led
+ set_state preinit_regular
}
boot_hook_add preinit_main indicate_regular_preinit