From: Markus Wigge <mwigge@marcant.net>
Date: Mon, 2 Aug 2010 10:32:39 +0000 (+0000)
Subject: LED handling fixes for WRT54-G3Gv2
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=4e1c5b8ba285b3e9c73ce2664094ab83bb203576;p=openwrt%2Fstaging%2Fluka.git

LED handling fixes for WRT54-G3Gv2

SVN-Revision: 22462
---

diff --git a/package/comgt/Makefile b/package/comgt/Makefile
index 253e12af0e..b0a55ffecf 100644
--- a/package/comgt/Makefile
+++ b/package/comgt/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=comgt
 PKG_VERSION:=0.32
-PKG_RELEASE:=4
+PKG_RELEASE:=5
 
 PKG_SOURCE:=$(PKG_NAME).$(PKG_VERSION).tgz
 PKG_SOURCE_URL:=@SF/comgt
@@ -49,7 +49,7 @@ define Package/comgt/install
 	$(INSTALL_DATA) ./files/3g.chat $(1)/etc/chatscripts/3g.chat
 	$(INSTALL_DATA) ./files/evdo.chat $(1)/etc/chatscripts/evdo.chat
 	$(INSTALL_DIR) $(1)/lib/network
-	$(INSTALL_DATA) ./files/3g.sh $(1)/lib/network/3g.sh
+	$(INSTALL_BIN) ./files/3g.sh $(1)/lib/network/3g.sh
 	$(INSTALL_DIR) $(1)/etc/hotplug.d/button
 	$(INSTALL_DATA) ./files/3g.button $(1)/etc/hotplug.d/button/05-3g
 	$(INSTALL_DIR) $(1)/etc/hotplug.d/iface
diff --git a/package/comgt/files/3g.sh b/package/comgt/files/3g.sh
index 59e99c761d..c6f8ffbfc2 100644
--- a/package/comgt/files/3g.sh
+++ b/package/comgt/files/3g.sh
@@ -1,9 +1,10 @@
 set_3g_led() {
 	# set on WRT54G3G only
-	[ -d /proc/diag ] || return 0
-	grep WRT54G3G /proc/diag/model >/dev/null || return 0
+	[ -f /proc/diag/model ] || return 0
+	grep -q "WRT54G3G" /proc/diag/model >/dev/null || return 0
 	echo "$1" > /proc/diag/led/3g_green
 	echo "$2" > /proc/diag/led/3g_blue
+	grep -q "WRT54G3G$" /proc/diag/model >/dev/null || return 0
 	echo "$3" > /proc/diag/led/3g_blink
 }