procd: make the preinit rules wildcard all buttons for failsafe

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

diff --git a/package/base-files/files/lib/preinit/30_failsafe_wait b/package/base-files/files/lib/preinit/30_failsafe_wait
index 5d6def72ac3a25fb9a832aa0a8c19ff3651eba28..3c5ece9f76f8049845fc498f1ffac57eb89561c2 100644 (file)
--- a/package/base-files/files/lib/preinit/30_failsafe_wait
+++ b/package/base-files/files/lib/preinit/30_failsafe_wait
@@ -78,8 +78,9 @@ failsafe_wait() {
       pi_failsafe_net_message=true
       preinit_net_echo "Please press button now to enter failsafe"
       pi_failsafe_net_message=false
       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
-      [ -f "/tmp/failsafe_button" ] && FAILSAFE=true && export FAILSAFE && rm /tmp/failsafe_button
+      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
 }
 
     fi
 }
 

diff --git a/package/procd/files/hotplug-preinit.json b/package/procd/files/hotplug-preinit.json
index d212b22fac33e4a70ba501dfff3e4cee10705e17..614b1047115b261ec74466b2de5303b4750dcfb4 100644 (file)
--- a/package/procd/files/hotplug-preinit.json
+++ b/package/procd/files/hotplug-preinit.json
@@ -14,7 +14,6 @@
        [ "if",
                [ "and",
                        [ "eq", "SUBSYSTEM", "button" ],
        [ "if",
                [ "and",
                        [ "eq", "SUBSYSTEM", "button" ],

-                       [ "eq", "BUTTON", "reset" ],

                ],
                [ "exec", "/etc/rc.button/failsafe" ]
        ],
                ],
                [ "exec", "/etc/rc.button/failsafe" ]
        ],