[backfire] merge r22462, r22561, r25621 and r26175

git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@26177 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/comgt/Makefile b/package/comgt/Makefile
index e8ce8d4..458c132 100644 (file)
--- a/package/comgt/Makefile
+++ b/package/comgt/Makefile
@@ -1,5 +1,5 @@
 #
-# Copyright (C) 2006-2010 OpenWrt.org
+# Copyright (C) 2006-2011 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=comgt
 PKG_VERSION:=0.32
-PKG_RELEASE:=4
+PKG_RELEASE:=8
 
 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 b1ce2ab..616beec 100644 (file)
--- 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
 }
 

diff --git a/package/comgt/files/3g.usb b/package/comgt/files/3g.usb
index c52646b..d5a38b8 100644 (file)
--- a/package/comgt/files/3g.usb
+++ b/package/comgt/files/3g.usb
@@ -36,8 +36,8 @@ if [ "$ACTION" = add ]; then
        esac
 
        local tty
-       for tty in /sys/$DEVPATH/ttyUSB*; do
-               [ -d "$tty" ] || break
+       for tty in /sys/$DEVPATH/ttyUSB* /sys/$DEVPATH/tty/ttyACM* /sys/$DEVPATH/tty/ttyHS*; do
+               [ -d "$tty" ] || continue
                config_foreach find_3g_iface interface "$tty"
        done
 fi