summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorblogic <blogic@3c298f89-4303-0410-b956-a3cf2f4a3e73>2013-07-25 20:28:36 +0000
committerblogic <blogic@3c298f89-4303-0410-b956-a3cf2f4a3e73>2013-07-25 20:28:36 +0000
commit3200ad96ed2583a3e53e99cc5d32fbe213e125cf (patch)
tree0c5084ea68698f08ad4cee2085cf379e31caf5c6
parent8eb156edbc47b61f844d77261eba34054e4efb7d (diff)
base-files: be verbose when entering failsafe due to a button being pressed
Signed-off-by: John Crispin <blogic@openwrt.org> git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37535 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rwxr-xr-xpackage/base-files/files/etc/rc.button/failsafe2
-rw-r--r--package/base-files/files/lib/preinit/30_failsafe_wait2
2 files changed, 2 insertions, 2 deletions
diff --git a/package/base-files/files/etc/rc.button/failsafe b/package/base-files/files/etc/rc.button/failsafe
index dcdf7de80e..b372c04c4e 100755
--- a/package/base-files/files/etc/rc.button/failsafe
+++ b/package/base-files/files/etc/rc.button/failsafe
@@ -1,2 +1,2 @@
#!/bin/sh
-touch /tmp/failsafe_button
+echo ${BUTTON} > /tmp/failsafe_button
diff --git a/package/base-files/files/lib/preinit/30_failsafe_wait b/package/base-files/files/lib/preinit/30_failsafe_wait
index 3c5ece9f76..6bce8ae49f 100644
--- a/package/base-files/files/lib/preinit/30_failsafe_wait
+++ b/package/base-files/files/lib/preinit/30_failsafe_wait
@@ -79,7 +79,7 @@ failsafe_wait() {
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
- [ -f "/tmp/failsafe_button" ] && FAILSAFE=true
+ [ -f "/tmp/failsafe_button" ] && FAILSAFE=true && echo "- failsafe button "`cat /tmp/failsafe_button`" was pressed -"
[ "$FAILSAFE" = "true" ] && export FAILSAFE && touch /tmp/failsafe
fi
}