aboutsummaryrefslogtreecommitdiffstats
path: root/package/base-files/files/lib/preinit/30_failsafe_wait
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2013-03-13 18:11:19 +0000
committerJohn Crispin <john@openwrt.org>2013-03-13 18:11:19 +0000
commitf43b7934d2850c2f545736253a0f8cbe4915fdff (patch)
tree3718ca82dd27e3917a51439823bfb20a067af784 /package/base-files/files/lib/preinit/30_failsafe_wait
parent1360067c4a75cd1804710e6f25871f695d3271b2 (diff)
downloadupstream-f43b7934d2850c2f545736253a0f8cbe4915fdff.tar.gz
upstream-f43b7934d2850c2f545736253a0f8cbe4915fdff.tar.bz2
upstream-f43b7934d2850c2f545736253a0f8cbe4915fdff.zip
make basefiles aware of procd
Signed-off-by: John Crispin <blogic@openwrt.org> SVN-Revision: 36003
Diffstat (limited to 'package/base-files/files/lib/preinit/30_failsafe_wait')
-rw-r--r--package/base-files/files/lib/preinit/30_failsafe_wait5
1 files changed, 2 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 04dc57df20..808d9731b7 100644
--- a/package/base-files/files/lib/preinit/30_failsafe_wait
+++ b/package/base-files/files/lib/preinit/30_failsafe_wait
@@ -61,11 +61,10 @@ fs_wait_for_key () {
}
lock -w $keypress_wait
- trap - INT
- trap - USR1
-
keypressed=1
[ "$(cat $keypress_true)" = "true" ] && keypressed=0
+ [ -f "/tmp/failsafe_button" ] && keypressed=1
+
rm -f $keypress_true
rm -f $keypress_wait
rm -f $keypress_sec