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 bcf24f8bb7c5d72519f0fed92747a4037a96f5a4..5d6def72ac3a25fb9a832aa0a8c19ff3651eba28 100644 (file)
--- 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
 }