procd: make the preinit rules wildcard all buttons for failsafe

[openwrt/openwrt.git] / package / base-files / files / lib / preinit / 30_failsafe_wait

diff --git a/package/base-files/files/lib/preinit/30_failsafe_wait b/package/base-files/files/lib/preinit/30_failsafe_wait
index bcf24f8bb7c5d72519f0fed92747a4037a96f5a4..3c5ece9f76f8049845fc498f1ffac57eb89561c2 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
@@ -79,7 +78,9 @@ failsafe_wait() {
       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
+      fs_wait_for_key f 'to enter failsafe mode' $fs_failsafe_wait_timeout && FAILSAFE=true
+      [ -f "/tmp/failsafe_button" ] && FAILSAFE=true
+      [ "$FAILSAFE" = "true" ] && export FAILSAFE && touch /tmp/failsafe
     fi
 }