From: Luka Perkov <luka@openwrt.org>
Date: Mon, 11 Nov 2013 23:34:11 +0000 (+0000)
Subject: base-files: don't enter failsafe if triggered by switch
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=1df0179b2834ab284dba93e9f45b2f4796e995ad;p=openwrt%2Fstaging%2Fblocktrron.git

base-files: don't enter failsafe if triggered by switch

Fixes failsafe issues with switches after r38725.

Signed-off-by: Luka Perkov <luka@openwrt.org>

SVN-Revision: 38770
---

diff --git a/package/base-files/Makefile b/package/base-files/Makefile
index f0b2e37d5b..31c6e984bc 100644
--- a/package/base-files/Makefile
+++ b/package/base-files/Makefile
@@ -11,7 +11,7 @@ include $(INCLUDE_DIR)/kernel.mk
 include $(INCLUDE_DIR)/version.mk
 
 PKG_NAME:=base-files
-PKG_RELEASE:=147
+PKG_RELEASE:=148
 
 PKG_FILE_DEPENDS:=$(PLATFORM_DIR)/ $(GENERIC_PLATFORM_DIR)/base-files/
 PKG_BUILD_DEPENDS:=opkg/host
diff --git a/package/base-files/files/etc/rc.button/failsafe b/package/base-files/files/etc/rc.button/failsafe
index b372c04c4e..bfad810428 100755
--- a/package/base-files/files/etc/rc.button/failsafe
+++ b/package/base-files/files/etc/rc.button/failsafe
@@ -1,2 +1,3 @@
 #!/bin/sh
-echo ${BUTTON} > /tmp/failsafe_button
+
+[ "${TYPE}" = "switch" ] || echo ${BUTTON} > /tmp/failsafe_button