diff options
| author | John Crispin <blogic@openwrt.org> | 2013-04-25 19:02:37 +0000 |
|---|---|---|
| committer | John Crispin <blogic@openwrt.org> | 2013-04-25 19:02:37 +0000 |
| commit | 9801819da6a2be2316538842357eedb1f224bbae (patch) | |
| tree | 8cd96472fa1d133445289391656fa5cb09e0480d /package/base-files/files | |
| parent | 1940283948acad2081249eaaa5ebb663998de9ad (diff) | |
| download | upstream-9801819da6a2be2316538842357eedb1f224bbae.tar.gz upstream-9801819da6a2be2316538842357eedb1f224bbae.tar.bz2 upstream-9801819da6a2be2316538842357eedb1f224bbae.zip | |
preinit: move cmdline failsafe= handling ot the generic code
Signed-off-by: John Crispin <blogic@openwrt.org>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36430 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/base-files/files')
| -rw-r--r-- | package/base-files/files/lib/preinit/30_failsafe_wait | 11 |
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 |