From: John Crispin <john@openwrt.org>
Date: Thu, 25 Jul 2013 20:28:36 +0000 (+0000)
Subject: base-files: be verbose when entering failsafe due to a button being pressed
X-Git-Tag: reboot~9703
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=3e54dbbf6077261fdb19cf6005b1ddd58d951640;p=openwrt%2Fstaging%2Fnoltari.git

base-files: be verbose when entering failsafe due to a button being pressed

Signed-off-by: John Crispin <blogic@openwrt.org>

SVN-Revision: 37535
---

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
 }