1
0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-27 17:13:11 +02:00

[backfire] merge r26809, r26810 and r26816

git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@26849 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
jow 2011-05-08 10:32:23 +00:00
parent 0f727a9345
commit 33e62bd5c5
2 changed files with 23 additions and 24 deletions

View File

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=comgt PKG_NAME:=comgt
PKG_VERSION:=0.32 PKG_VERSION:=0.32
PKG_RELEASE:=8 PKG_RELEASE:=9
PKG_SOURCE:=$(PKG_NAME).$(PKG_VERSION).tgz PKG_SOURCE:=$(PKG_NAME).$(PKG_VERSION).tgz
PKG_SOURCE_URL:=@SF/comgt PKG_SOURCE_URL:=@SF/comgt
@ -54,8 +54,8 @@ define Package/comgt/install
$(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
$(INSTALL_DATA) ./files/3g.iface $(1)/etc/hotplug.d/iface/05-3g $(INSTALL_DATA) ./files/3g.iface $(1)/etc/hotplug.d/iface/05-3g
$(INSTALL_DIR) $(1)/etc/hotplug.d/usb $(INSTALL_DIR) $(1)/etc/hotplug.d/tty
$(INSTALL_DATA) ./files/3g.usb $(1)/etc/hotplug.d/usb/30-3g $(INSTALL_DATA) ./files/3g.usb $(1)/etc/hotplug.d/tty/30-3g
$(INSTALL_DIR) $(1)/etc/gcom $(INSTALL_DIR) $(1)/etc/gcom
$(INSTALL_DATA) ./files/setpin.gcom $(1)/etc/gcom/setpin.gcom $(INSTALL_DATA) ./files/setpin.gcom $(1)/etc/gcom/setpin.gcom
$(INSTALL_DATA) ./files/setmode.gcom $(1)/etc/gcom/setmode.gcom $(INSTALL_DATA) ./files/setmode.gcom $(1)/etc/gcom/setmode.gcom

View File

@ -12,32 +12,31 @@ find_3g_iface() {
local proto local proto
config_get proto "$cfg" proto config_get proto "$cfg" proto
[ "$proto" = 3g ] || return 0
[ "$proto" = 3g ] && { local auto
local auto config_get_bool auto "$cfg" auto 1
config_get_bool auto "$cfg" auto 1 [ "$auto" = 1 ] || [ "$ACTION" = remove ] || return 0
[ "$auto" = 1 ] || return 0
local dev local dev
config_get dev "$cfg" device config_get dev "$cfg" device
if [ "${dev##*/}" = "${tty##*/}" ]; then if [ "${dev##*/}" = "${tty##*/}" ]; then
log "Starting interface $cfg for device ${tty##*/}" if [ "$ACTION" = add ]; then
log "Starting interface $cfg for device ${dev##*/}"
( sleep 1; /sbin/ifup "$cfg" ) & ( sleep 1; /sbin/ifup "$cfg" ) &
else
log "Stopping interface $cfg for device ${dev##*/}"
/sbin/ifdown "$cfg" &
fi 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