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>

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@43715 3c298f89-4303-0410-b956-a3cf2f4a3e73
master
John Crispin 2014-12-15 10:37:00 +00:00
parent 5db780f399
commit ff1614a661
17 changed files with 50 additions and 6 deletions

View File

@ -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
}

View File

@ -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

View File

@ -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

View File

@ -12,6 +12,9 @@ set_state() {
failsafe)
status_led_blink_failsafe
;;
preinit_regular)
status_led_blink_preinit_regular
;;
done)
status_led_on
;;

View File

@ -29,6 +29,9 @@ set_state() {
failsafe)
status_led_set_timer 50 50
;;
preinit_regular)
status_led_blink_preinit_regular
;;
done)
[ "$status_led" = "status" ] && {
status_led_set_heartbeat

View File

@ -305,6 +305,9 @@ set_state() {
failsafe)
status_led_blink_failsafe
;;
preinit_regular)
status_led_blink_preinit_regular
;;
done)
status_led_on
case $(ar71xx_board_name) in

View File

@ -15,6 +15,10 @@ set_state() {
status_led_blink_failsafe
;;
preinit_regular)
status_led_blink_preinit_regular
;;
done)
status_led_on
;;

View File

@ -33,6 +33,9 @@ set_state() {
failsafe)
status_led_blink_failsafe
;;
preinit_regular)
status_led_blink_preinit_regular
;;
done)
status_led_on
;;

View File

@ -31,6 +31,9 @@ set_state() {
failsafe)
status_led_blink_failsafe
;;
preinit_regular)
status_led_blink_preinit_regular
;;
done)
status_led_on
;;

View File

@ -12,6 +12,9 @@ set_state() {
failsafe)
status_led_set_timer 50 50
;;
preinit_regular)
status_led_set_timer 500 500
;;
done)
if [ "${status_led/power}" != "$status_led" ]; then
status_led_on

View File

@ -22,6 +22,9 @@ set_state() {
failsafe)
status_led_blink_failsafe
;;
preinit_regular)
status_led_blink_preinit_regular
;;
done)
status_led_on
;;

View File

@ -22,6 +22,9 @@ set_state() {
failsafe)
status_led_blink_failsafe
;;
preinit_regular)
status_led_blink_preinit_regular
;;
done)
status_led_on
;;

View File

@ -24,6 +24,10 @@ set_state() {
status_led_blink_failsafe
;;
preinit_regular)
status_led_blink_preinit_regular
;;
done)
status_led_on
;;

View File

@ -22,6 +22,9 @@ set_state() {
failsafe)
status_led_blink_failsafe
;;
preinit_regular)
status_led_blink_preinit_regular
;;
done)
status_led_on
;;

View File

@ -28,6 +28,9 @@ set_state() {
failsafe)
status_led_blink_failsafe
;;
preinit_regular)
status_led_blink_preinit_regular
;;
done)
status_led_on
;;

View File

@ -28,6 +28,9 @@ set_state() {
failsafe)
status_led_blink_failsafe
;;
preinit_regular)
status_led_blink_preinit_regular
;;
done)
status_led_on
;;

View File

@ -227,6 +227,9 @@ set_state() {
failsafe)
status_led_blink_failsafe
;;
preinit_regular)
status_led_blink_preinit_regular
;;
done)
status_led_on
;;