aboutsummaryrefslogtreecommitdiffstats
path: root/package/base-files
diff options
context:
space:
mode:
authorJohn Crispin <blogic@openwrt.org>2013-06-10 08:24:44 +0000
committerJohn Crispin <blogic@openwrt.org>2013-06-10 08:24:44 +0000
commit755a5b2ee5e70f89532bb597b690d4f60512e70e (patch)
tree10c8563db601015d37512ea665c1f71da6c46dcb /package/base-files
parent0dabdd474a15d1014cf91fefce9d60c7f9d7781c (diff)
downloadmaster-187ad058-755a5b2ee5e70f89532bb597b690d4f60512e70e.tar.gz
master-187ad058-755a5b2ee5e70f89532bb597b690d4f60512e70e.tar.bz2
master-187ad058-755a5b2ee5e70f89532bb597b690d4f60512e70e.zip
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
Diffstat (limited to 'package/base-files')
-rw-r--r--package/base-files/files/lib/preinit/30_failsafe_wait5
1 files changed, 3 insertions, 2 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
}