Browse Source

LED handling fixes for WRT54-G3Gv2

SVN-Revision: 22462
Markus Wigge 15 years ago
parent
commit
4e1c5b8ba2
2 changed files with 5 additions and 4 deletions
  1. 2 2
      package/comgt/Makefile
  2. 3 2
      package/comgt/files/3g.sh

+ 2 - 2
package/comgt/Makefile

@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 
 PKG_NAME:=comgt
 PKG_NAME:=comgt
 PKG_VERSION:=0.32
 PKG_VERSION:=0.32
-PKG_RELEASE:=4
+PKG_RELEASE:=5
 
 
 PKG_SOURCE:=$(PKG_NAME).$(PKG_VERSION).tgz
 PKG_SOURCE:=$(PKG_NAME).$(PKG_VERSION).tgz
 PKG_SOURCE_URL:=@SF/comgt
 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/3g.chat $(1)/etc/chatscripts/3g.chat
 	$(INSTALL_DATA) ./files/evdo.chat $(1)/etc/chatscripts/evdo.chat
 	$(INSTALL_DATA) ./files/evdo.chat $(1)/etc/chatscripts/evdo.chat
 	$(INSTALL_DIR) $(1)/lib/network
 	$(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_DIR) $(1)/etc/hotplug.d/button
 	$(INSTALL_DATA) ./files/3g.button $(1)/etc/hotplug.d/button/05-3g
 	$(INSTALL_DATA) ./files/3g.button $(1)/etc/hotplug.d/button/05-3g
 	$(INSTALL_DIR) $(1)/etc/hotplug.d/iface
 	$(INSTALL_DIR) $(1)/etc/hotplug.d/iface

+ 3 - 2
package/comgt/files/3g.sh

@@ -1,9 +1,10 @@
 set_3g_led() {
 set_3g_led() {
 	# set on WRT54G3G only
 	# 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 "$1" > /proc/diag/led/3g_green
 	echo "$2" > /proc/diag/led/3g_blue
 	echo "$2" > /proc/diag/led/3g_blue
+	grep -q "WRT54G3G$" /proc/diag/model >/dev/null || return 0
 	echo "$3" > /proc/diag/led/3g_blink
 	echo "$3" > /proc/diag/led/3g_blink
 }
 }