summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-01-28 19:27:49 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2010-01-28 19:27:49 +0000
commit5b5b4dd41ca3d483868b80aeb040f72628ffd8e6 (patch)
tree0a03551c6a335819f2f161d80a0a1d5ad66e4433
parentddac78a7682a411dfc3e06971c14c216c35cce00 (diff)
preinit: Remove Ctrl-C prompt...impossible on /dev/console (patch by cshore)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@19367 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/base-files/files/lib/preinit/30_failsafe_wait2
-rw-r--r--target/linux/pxcab/base-files/lib/preinit/45_failsafe_pxcab2
-rw-r--r--target/linux/x86/base-files/lib/preinit/45_failsafe_x862
-rw-r--r--target/linux/x86/olpc/base-files/lib/preinit/45_failsafe_x862
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
}