From b88fc11e2a4f4f98da001f714186d4ddff1389d9 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Thu, 28 Jan 2010 19:27:49 +0000 Subject: [PATCH] preinit: Remove Ctrl-C prompt...impossible on /dev/console (patch by cshore) SVN-Revision: 19367 --- package/base-files/files/lib/preinit/30_failsafe_wait | 2 +- target/linux/pxcab/base-files/lib/preinit/45_failsafe_pxcab | 2 +- target/linux/x86/base-files/lib/preinit/45_failsafe_x86 | 2 +- target/linux/x86/olpc/base-files/lib/preinit/45_failsafe_x86 | 2 +- 4 files changed, 4 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 084f9945e8..5f6dd90e48 100644 --- a/package/base-files/files/lib/preinit/30_failsafe_wait +++ b/package/base-files/files/lib/preinit/30_failsafe_wait @@ -78,7 +78,7 @@ failsafe_wait() { pi_failsafe_net_message=true preinit_net_echo "Please press button now to enter failsafe" pi_failsafe_net_message=false - echo -n "Press CTRL-C or " + echo -n "Press " fs_wait_for_key f 'to enter failsafe mode' $fs_failsafe_wait_timeout && FAILSAFE=true && export FAILSAFE } diff --git a/target/linux/pxcab/base-files/lib/preinit/45_failsafe_pxcab b/target/linux/pxcab/base-files/lib/preinit/45_failsafe_pxcab index 6e5636a8cb..97392774da 100644 --- a/target/linux/pxcab/base-files/lib/preinit/45_failsafe_pxcab +++ b/target/linux/pxcab/base-files/lib/preinit/45_failsafe_pxcab @@ -7,7 +7,7 @@ failsafe_wait() { grep 'failsafe=' /proc/cmdline > /dev/null && FAILSAFE=true && export FAILSAFE if [ "$FAILSAFE" != "true" ]; then preinit_net_echo "Please press button now to enter failsafe" - echo -n "Press CTRL-C or " + echo -n "Press " 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 index 6e5636a8cb..97392774da 100644 --- a/target/linux/x86/base-files/lib/preinit/45_failsafe_x86 +++ b/target/linux/x86/base-files/lib/preinit/45_failsafe_x86 @@ -7,7 +7,7 @@ failsafe_wait() { grep 'failsafe=' /proc/cmdline > /dev/null && FAILSAFE=true && export FAILSAFE if [ "$FAILSAFE" != "true" ]; then preinit_net_echo "Please press button now to enter failsafe" - echo -n "Press CTRL-C or " + echo -n "Press " 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 index 6e5636a8cb..97392774da 100644 --- a/target/linux/x86/olpc/base-files/lib/preinit/45_failsafe_x86 +++ b/target/linux/x86/olpc/base-files/lib/preinit/45_failsafe_x86 @@ -7,7 +7,7 @@ failsafe_wait() { grep 'failsafe=' /proc/cmdline > /dev/null && FAILSAFE=true && export FAILSAFE if [ "$FAILSAFE" != "true" ]; then preinit_net_echo "Please press button now to enter failsafe" - echo -n "Press CTRL-C or " + echo -n "Press " fs_wait_for_key f 'to enter failsafe mode' $fs_failsafe_wait_timeout && FAILSAFE=true && export FAILSAFE fi } -- 2.25.1