Changeset 26849

Timestamp:

2011-05-08T12:32:23+02:00 (7 years ago)

Author:

jow

Message:

[backfire] merge r26809, r26810 and r26816

Location:

branches/backfire/package/comgt

Files:

• Makefile (modified) (2 diffs)
• files/3g.usb (modified) (1 diff)

branches/backfire/package/comgt/Makefile

@@ -10 +10 @@
 PKG_NAME:=comgt
 PKG_VERSION:=0.32
-PKG_RELEASE:=8
+PKG_RELEASE:=9
 
 PKG_SOURCE:=$(PKG_NAME).$(PKG_VERSION).tgz
@@ -55 +55 @@
         $(INSTALL_DIR) $(1)/etc/hotplug.d/iface
         $(INSTALL_DATA) ./files/3g.iface $(1)/etc/hotplug.d/iface/05-3g
-        $(INSTALL_DIR) $(1)/etc/hotplug.d/usb
-        $(INSTALL_DATA) ./files/3g.usb $(1)/etc/hotplug.d/usb/30-3g
+        $(INSTALL_DIR) $(1)/etc/hotplug.d/tty
+        $(INSTALL_DATA) ./files/3g.usb $(1)/etc/hotplug.d/tty/30-3g
         $(INSTALL_DIR) $(1)/etc/gcom
         $(INSTALL_DATA) ./files/setpin.gcom $(1)/etc/gcom/setpin.gcom

branches/backfire/package/comgt/files/3g.usb

@@ -13 +13 @@
         local proto
         config_get proto "$cfg" proto
+        [ "$proto" = 3g ] || return 0
 
-        [ "$proto" = 3g ] && {
-                local auto
-                config_get_bool auto "$cfg" auto 1
-                [ "$auto" = 1 ] || return 0
+        local auto
+        config_get_bool auto "$cfg" auto 1
+        [ "$auto" = 1 ] || [ "$ACTION" = remove ] || return 0
 
-                local dev
-                config_get dev "$cfg" device
+        local dev
+        config_get dev "$cfg" device
 
-                if [ "${dev##*/}" = "${tty##*/}" ]; then
-                        log "Starting interface $cfg for device ${tty##*/}"
+        if [ "${dev##*/}" = "${tty##*/}" ]; then
+                if [ "$ACTION" = add ]; then
+                        log "Starting interface $cfg for device ${dev##*/}"
                         ( sleep 1; /sbin/ifup "$cfg" ) &
+                else
+                        log "Stopping interface $cfg for device ${dev##*/}"
+                        /sbin/ifdown "$cfg" &
                 fi
-        }
+        fi
 }
 
+case "$DEVICENAME" in
+        tty*)
+                [ -e "/dev/$DEVICENAME" ] || [ "$ACTION" = remove ] || exit 0
+                config_load network
+                config_foreach find_3g_iface interface "/dev/$DEVICENAME"
+        ;;
+esac
 
-if [ "$ACTION" = add ]; then
-        case "$DEVICENAME" in
-                *-*:*.*) config_load network;;
-                *) exit 0;;
-        esac
-
-        local tty
-        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