diff options
| author | Luka Perkov <luka@openwrt.org> | 2013-11-11 23:34:11 +0000 |
|---|---|---|
| committer | Luka Perkov <luka@openwrt.org> | 2013-11-11 23:34:11 +0000 |
| commit | a2f5118bb7db4ccac39f962aef6a16066ecda76e (patch) | |
| tree | 8bbb8d5c495dc9923346a0ead4ce02ca3e411718 | |
| parent | 92de1b3c5677b0ea732cdede05e8756c633147ac (diff) | |
| download | upstream-a2f5118bb7db4ccac39f962aef6a16066ecda76e.tar.gz upstream-a2f5118bb7db4ccac39f962aef6a16066ecda76e.tar.bz2 upstream-a2f5118bb7db4ccac39f962aef6a16066ecda76e.zip | |
[package] 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>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@38770 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | package/base-files/Makefile | 2 | ||||
| -rwxr-xr-x | package/base-files/files/etc/rc.button/failsafe | 3 |
2 files changed, 3 insertions, 2 deletions
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 |