From 085b2b9ad6216508ff357dcb49757173d269fbb9 Mon Sep 17 00:00:00 2001 From: Jo-Philipp Wich Date: Sat, 1 May 2010 18:01:36 +0000 Subject: [PATCH] comgt: - localize variables - bring scripts in sync with updated ppp logic - bump package revision SVN-Revision: 21285 --- package/comgt/Makefile | 2 +- package/comgt/files/3g.sh | 18 ++++++++++++++---- 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/package/comgt/Makefile b/package/comgt/Makefile index 3c638db4e9..97ce6c2b8c 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:=1 +PKG_RELEASE:=2 PKG_SOURCE:=$(PKG_NAME).$(PKG_VERSION).tgz PKG_SOURCE_URL:=@SF/comgt diff --git a/package/comgt/files/3g.sh b/package/comgt/files/3g.sh index 8fcac0936a..59e99c761d 100644 --- a/package/comgt/files/3g.sh +++ b/package/comgt/files/3g.sh @@ -9,8 +9,6 @@ set_3g_led() { scan_3g() { local device - - scan_ppp "$@" config_get device "$1" device # try to figure out the device if it's invalid @@ -24,6 +22,7 @@ scan_3g() { } # enable 3G with the 3G button by default + local button config_get button "$1" button [ -z "$button" ] && { config_set "$1" button 1 @@ -31,6 +30,7 @@ scan_3g() { } stop_interface_3g() { + stop_interface_ppp "$1" set_3g_led 0 0 0 killall gcom >/dev/null 2>/dev/null } @@ -39,8 +39,11 @@ setup_interface_3g() { local iface="$1" local config="$2" local chat="/etc/chatscripts/3g.chat" - + + local device config_get device "$config" device + + local maxwait config_get maxwait "$config" maxwait maxwait=${maxwait:-20} while [ ! -e "$device" -a $maxwait -gt 0 ];do # wait for driver loading to catch up @@ -52,9 +55,16 @@ setup_interface_3g() { /sbin/insmod $module 2>&- >&- done + local apn config_get apn "$config" apn + + local service config_get service "$config" service + + local pincode config_get pincode "$config" pincode + + local mtu config_get mtu "$config" mtu set_3g_led 1 0 1 @@ -80,7 +90,7 @@ setup_interface_3g() { mode="AT_OPSYS=${CODE}" fi # Don't assume Option to be default as it breaks with Huawei Cards/Sticks - + PINCODE="$pincode" gcom -d "$device" -s /etc/gcom/setpin.gcom || { echo "$config(3g): Failed to set the PIN code." set_3g_led 0 0 0 -- 2.25.1