Preinit still had a few references to Ctrl-C even we have figured out that Ctrl-C to interrupt is not available on /dev/console because it's not a controlling terminal and it would be a bad idea to make it one (because it would interfere with normal operating mode).
-- And that's my crabbing done for the day. Got it out of the way early, now I have the rest of the afternoon to sniff fragrant tea-roses or strangle cute bunnies or something. -- Michael Devore GnuPG Key Fingerprint 86 F5 81 A5 D4 2E 1F 1C http://gnupg.org The C Shore (Daniel Dickinson's Website) http://cshore.is-a-geek.com
Index: target/linux/x86/base-files/lib/preinit/45_failsafe_x86
===================================================================
--- target/linux/x86/base-files/lib/preinit/45_failsafe_x86 (revision 19361)
+++ target/linux/x86/base-files/lib/preinit/45_failsafe_x86 (working copy)
@@ -7,7 +7,7 @@
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
}
Index: target/linux/x86/olpc/base-files/lib/preinit/45_failsafe_x86
===================================================================
--- target/linux/x86/olpc/base-files/lib/preinit/45_failsafe_x86 (revision 19361)
+++ target/linux/x86/olpc/base-files/lib/preinit/45_failsafe_x86 (working copy)
@@ -7,7 +7,7 @@
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
}
Index: target/linux/pxcab/base-files/lib/preinit/45_failsafe_pxcab
===================================================================
--- target/linux/pxcab/base-files/lib/preinit/45_failsafe_pxcab (revision 19361)
+++ target/linux/pxcab/base-files/lib/preinit/45_failsafe_pxcab (working copy)
@@ -7,7 +7,7 @@
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
}
Index: package/base-files/files/lib/preinit/30_failsafe_wait
===================================================================
--- package/base-files/files/lib/preinit/30_failsafe_wait (revision 19361)
+++ package/base-files/files/lib/preinit/30_failsafe_wait (working copy)
@@ -78,7 +78,7 @@
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
}
signature.asc
Description: This is a digitally signed message part
_______________________________________________ openwrt-devel mailing list [email protected] https://lists.openwrt.org/mailman/listinfo/openwrt-devel
