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

SVN-Revision: 19367

diff --git a/package/base-files/files/lib/preinit/30_failsafe_wait b/package/base-files/files/lib/preinit/30_failsafe_wait
index 084f9945e8ec3157dfddfdc03ddc9c8b661569f9..5f6dd90e4831f895328723a3a6e540a781e81d1a 100644 (file)
--- 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 6e5636a8cb1863c2478795e2ef59904f1a0d2c3a..97392774dad781234de8afce735a290b090caee8 100644 (file)
--- 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 6e5636a8cb1863c2478795e2ef59904f1a0d2c3a..97392774dad781234de8afce735a290b090caee8 100644 (file)
--- 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 6e5636a8cb1863c2478795e2ef59904f1a0d2c3a..97392774dad781234de8afce735a290b090caee8 100644 (file)
--- 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
 }