summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorblogic <blogic@3c298f89-4303-0410-b956-a3cf2f4a3e73>2013-06-10 08:24:44 +0000
committerblogic <blogic@3c298f89-4303-0410-b956-a3cf2f4a3e73>2013-06-10 08:24:44 +0000
commit181bf424027af6f3243645db40afc40bf4bc3dd2 (patch)
tree10c8563db601015d37512ea665c1f71da6c46dcb
parente31b7d5aa1b1fb4e20aedbcb45bea66c937435dc (diff)
procd: make the preinit rules wildcard all buttons for failsafe
Signed-off-by: John Crispin <blogic@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36896 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--package/base-files/files/lib/preinit/30_failsafe_wait5
-rw-r--r--package/procd/files/hotplug-preinit.json1
2 files changed, 3 insertions, 3 deletions
diff --git a/package/base-files/files/lib/preinit/30_failsafe_wait b/package/base-files/files/lib/preinit/30_failsafe_wait
index 5d6def72ac..3c5ece9f76 100644
--- 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
- 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
}
diff --git a/package/procd/files/hotplug-preinit.json b/package/procd/files/hotplug-preinit.json
index d212b22fac..614b104711 100644
--- a/package/procd/files/hotplug-preinit.json
+++ b/package/procd/files/hotplug-preinit.json
@@ -14,7 +14,6 @@
[ "if",
[ "and",
[ "eq", "SUBSYSTEM", "button" ],
- [ "eq", "BUTTON", "reset" ],
],
[ "exec", "/etc/rc.button/failsafe" ]
],