From: John Crispin <john@openwrt.org>
Date: Mon, 10 Jun 2013 08:24:13 +0000 (+0000)
Subject: base-files: fix failsafe via button press
X-Git-Tag: reboot~10253
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=5e45a68a4a68afe92be61d73d95ebb6fb81074cb;p=openwrt%2Fopenwrt.git

base-files: fix failsafe via button press

entering failsafe by pressing a button during boot was broken for procd as init

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

SVN-Revision: 36891
---

diff --git a/package/base-files/files/lib/preinit/30_failsafe_wait b/package/base-files/files/lib/preinit/30_failsafe_wait
index bcf24f8bb7..5d6def72ac 100644
--- a/package/base-files/files/lib/preinit/30_failsafe_wait
+++ b/package/base-files/files/lib/preinit/30_failsafe_wait
@@ -63,7 +63,6 @@ fs_wait_for_key () {
 
     keypressed=1
     [ "$(cat $keypress_true)" = "true" ] && keypressed=0
-    [ -f "/tmp/failsafe_button" ] && keypressed=1
     
     rm -f $keypress_true
     rm -f $keypress_wait
@@ -80,6 +79,7 @@ failsafe_wait() {
       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
+      [ -f "/tmp/failsafe_button" ] && FAILSAFE=true && export FAILSAFE && rm /tmp/failsafe_button
     fi
 }