diff options
| author | John Crispin <john@openwrt.org> | 2013-04-25 19:02:37 +0000 |
|---|---|---|
| committer | John Crispin <john@openwrt.org> | 2013-04-25 19:02:37 +0000 |
| commit | 831c7ea04faf74a1f30c3b03a11b3ac48bbfae48 (patch) | |
| tree | 2635b9c2701128719674cb679a63909979550aed | |
| parent | 811d90ff40eddb4dec53aef5276424f25fff4606 (diff) | |
| download | upstream-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
4 files changed, 7 insertions, 42 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 diff --git a/target/linux/adm8668/base-files/lib/preinit/45_failsafe_adm8668 b/target/linux/adm8668/base-files/lib/preinit/45_failsafe_adm8668 deleted file mode 100644 index c54aaed1ea..0000000000 --- a/target/linux/adm8668/base-files/lib/preinit/45_failsafe_adm8668 +++ /dev/null @@ -1,11 +0,0 @@ -#!/bin/sh - -failsafe_wait() { - FAILSAFE= - grep -q 'SES: UP FLIP' /proc/adm8668/buttons && FAILSAFE=true && export FAILSAFE - grep -q 'SES: DOWN' /proc/adm8668/buttons && FAILSAFE=true && export FAILSAFE - if [ "$FAILSAFE" != "true" ]; then - preinit_net_echo "Please press button now to enter failsafe" - fs_wait_for_key f 'to enter failsafe mode' $fs_failsafe_wait_timeout && FAILSAFE=true && export FAILSAFE - fi -} diff --git a/target/linux/x86/base-files/lib/preinit/45_failsafe_x86 b/target/linux/x86/base-files/lib/preinit/45_failsafe_x86 deleted file mode 100644 index 2ca039cbdb..0000000000 --- a/target/linux/x86/base-files/lib/preinit/45_failsafe_x86 +++ /dev/null @@ -1,13 +0,0 @@ -#!/bin/sh -# Copyright (C) 2006-2010 OpenWrt.org -# Copyright (C) 2010 Vertical Communications - -failsafe_wait() { - FAILSAFE= - grep -q 'failsafe=' /proc/cmdline && FAILSAFE=true && export FAILSAFE - if [ "$FAILSAFE" != "true" ]; then - preinit_net_echo "Please press button now to enter failsafe" - fs_wait_for_key f 'to enter failsafe mode' $fs_failsafe_wait_timeout && FAILSAFE=true && export FAILSAFE - fi -} - diff --git a/target/linux/x86/olpc/base-files/lib/preinit/45_failsafe_x86 b/target/linux/x86/olpc/base-files/lib/preinit/45_failsafe_x86 deleted file mode 100644 index dd7330d5d7..0000000000 --- a/target/linux/x86/olpc/base-files/lib/preinit/45_failsafe_x86 +++ /dev/null @@ -1,14 +0,0 @@ -#!/bin/sh -# Copyright (C) 2006-2010 OpenWrt.org -# Copyright (C) 2010 Vertical Communications - -failsafe_wait() { - FAILSAFE= - grep -q 'failsafe=' /proc/cmdline && FAILSAFE=true && export FAILSAFE - if [ "$FAILSAFE" != "true" ]; then - preinit_net_echo "Please press button now to enter failsafe" - echo -n "Press " - fs_wait_for_key f 'to enter failsafe mode' $fs_failsafe_wait_timeout && FAILSAFE=true && export FAILSAFE - fi -} - |