Quellcode durchsuchen

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 <[email protected]>

SVN-Revision: 36891
John Crispin vor 12 Jahren
Ursprung
Commit
5e45a68a4a
1 geänderte Dateien mit 1 neuen und 1 gelöschten Zeilen
  1. 1 1
      package/base-files/files/lib/preinit/30_failsafe_wait

+ 1 - 1
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
 }