aboutsummaryrefslogtreecommitdiffstats
path: root/package/base-files/files/lib/preinit/30_failsafe_wait
diff options
context:
space:
mode:
authorJohn Crispin <blogic@openwrt.org>2013-03-13 18:11:19 +0000
committerJohn Crispin <blogic@openwrt.org>2013-03-13 18:11:19 +0000
commit47d1577ffb1727e63a27c50a29d65cbea5625935 (patch)
tree4aeff8c4041964f40a41b510ee951adf81dffe17 /package/base-files/files/lib/preinit/30_failsafe_wait
parentbbb2cf0b18a152a867512ed72126d3560f581f9c (diff)
downloadupstream-47d1577ffb1727e63a27c50a29d65cbea5625935.tar.gz
upstream-47d1577ffb1727e63a27c50a29d65cbea5625935.tar.bz2
upstream-47d1577ffb1727e63a27c50a29d65cbea5625935.zip
[base-files] make basefiles aware of procd
Signed-off-by: John Crispin <blogic@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@36003 3c298f89-4303-0410-b956-a3cf2f4a3e73
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