aboutsummaryrefslogtreecommitdiffstats
path: root/package/base-files
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2013-04-25 19:02:37 +0000
committerJohn Crispin <john@openwrt.org>2013-04-25 19:02:37 +0000
commit831c7ea04faf74a1f30c3b03a11b3ac48bbfae48 (patch)
tree2635b9c2701128719674cb679a63909979550aed /package/base-files
parent811d90ff40eddb4dec53aef5276424f25fff4606 (diff)
downloadupstream-831c7ea04faf74a1f30c3b03a11b3ac48bbfae48.tar.gz
upstream-831c7ea04faf74a1f30c3b03a11b3ac48bbfae48.tar.bz2
upstream-831c7ea04faf74a1f30c3b03a11b3ac48bbfae48.zip
preinit: move cmdline failsafe= handling ot the generic code
Signed-off-by: John Crispin <blogic@openwrt.org> SVN-Revision: 36430
Diffstat (limited to 'package/base-files')
-rw-r--r--package/base-files/files/lib/preinit/30_failsafe_wait11
1 files changed, 7 insertions, 4 deletions
diff --git a/package/base-files/files/lib/preinit/30_failsafe_wait b/package/base-files/files/lib/preinit/30_failsafe_wait
index 808d9731b7..bcf24f8bb7 100644
--- a/package/base-files/files/lib/preinit/30_failsafe_wait
+++ b/package/base-files/files/lib/preinit/30_failsafe_wait
@@ -74,10 +74,13 @@ fs_wait_for_key () {
failsafe_wait() {
FAILSAFE=
- pi_failsafe_net_message=true
- preinit_net_echo "Please press button now to enter failsafe"
- pi_failsafe_net_message=false
- fs_wait_for_key f 'to enter failsafe mode' $fs_failsafe_wait_timeout && FAILSAFE=true && export FAILSAFE
+ grep -q 'failsafe=' /proc/cmdline && FAILSAFE=true && export FAILSAFE
+ if [ "$FAILSAFE" != "true" ]; then
+ pi_failsafe_net_message=true
+ preinit_net_echo "Please press button now to enter failsafe"
+ pi_failsafe_net_message=false
+ fs_wait_for_key f 'to enter failsafe mode' $fs_failsafe_wait_timeout && FAILSAFE=true && export FAILSAFE
+ fi
}
boot_hook_add preinit_main failsafe_wait