preinit: Remove Ctrl-C prompt...impossible on /dev/console (patch by cshore)

SVN-Revision: 19367
15 years ago · b88fc11e2a
parent 75e38a19cf
commit b88fc11e2a
4 changed files with 4 additions and 4 deletions
--- 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
 }

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