domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

preinit: move cmdline failsafe= handling ot the generic code

Browse Source 
Signed-off-by: John Crispin <blogic@openwrt.org>

SVN-Revision: 36430
This commit is contained in:
John Crispin
2013-04-25 19:02:37 +00:00
parent 811d90ff40
commit 831c7ea04f
4 changed files with 7 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
package/base-files/files/lib/preinit/30_failsafe_wait
View File

@@ -74,10 +74,13 @@ fs_wait_for_key () {
failsafe_wait() {
FAILSAFE=
pi_failsafe_net_message=true
preinit_net_echo "Please press button now to enter failsafe"
pi_failsafe_net_message=false
fs_wait_for_key f 'to enter failsafe mode' $fs_failsafe_wait_timeout && FAILSAFE=true && export FAILSAFE
grep -q 'failsafe=' /proc/cmdline && FAILSAFE=true && export FAILSAFE
if [ "$FAILSAFE" != "true" ]; then
pi_failsafe_net_message=true
preinit_net_echo "Please press button now to enter failsafe"
pi_failsafe_net_message=false
fs_wait_for_key f 'to enter failsafe mode' $fs_failsafe_wait_timeout && FAILSAFE=true && export FAILSAFE
fi
}
boot_hook_add preinit_main failsafe_wait