diff --git a/package/network/utils/comgt/Makefile b/package/network/utils/comgt/Makefile old mode 100755 new mode 100644 index 58466f498c..3b7f4b9022 --- a/package/network/utils/comgt/Makefile +++ b/package/network/utils/comgt/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=comgt PKG_VERSION:=0.32 -PKG_RELEASE:=32 +PKG_RELEASE:=30 PKG_SOURCE:=$(PKG_NAME).$(PKG_VERSION).tgz PKG_SOURCE_URL:=@SF/comgt @@ -80,7 +80,7 @@ define Package/comgt/install $(INSTALL_DATA) ./files/getcnum.gcom $(1)/etc/gcom/getcnum.gcom $(INSTALL_DATA) ./files/getimsi.gcom $(1)/etc/gcom/getimsi.gcom $(INSTALL_DIR) $(1)/etc/hotplug.d/tty - $(INSTALL_CONF) ./files/3g.usb $(1)/etc/hotplug.d/tty/30-3g + $(INSTALL_DATA) ./files/3g.usb $(1)/etc/hotplug.d/tty/30-3g $(INSTALL_DIR) $(1)/lib/netifd/proto $(INSTALL_BIN) ./files/3g.sh $(1)/lib/netifd/proto/3g.sh endef diff --git a/package/network/utils/comgt/files/3g.chat b/package/network/utils/comgt/files/3g.chat old mode 100755 new mode 100644 diff --git a/package/network/utils/comgt/files/3g.usb b/package/network/utils/comgt/files/3g.usb old mode 100755 new mode 100644 diff --git a/package/network/utils/comgt/files/directip-stop.gcom b/package/network/utils/comgt/files/directip-stop.gcom old mode 100755 new mode 100644 diff --git a/package/network/utils/comgt/files/directip.gcom b/package/network/utils/comgt/files/directip.gcom old mode 100755 new mode 100644 diff --git a/package/network/utils/comgt/files/evdo.chat b/package/network/utils/comgt/files/evdo.chat old mode 100755 new mode 100644 diff --git a/package/network/utils/comgt/files/getcardinfo.gcom b/package/network/utils/comgt/files/getcardinfo.gcom old mode 100755 new mode 100644 diff --git a/package/network/utils/comgt/files/getcarrier.gcom b/package/network/utils/comgt/files/getcarrier.gcom old mode 100755 new mode 100644 diff --git a/package/network/utils/comgt/files/getcnum.gcom b/package/network/utils/comgt/files/getcnum.gcom old mode 100755 new mode 100644 diff --git a/package/network/utils/comgt/files/getimsi.gcom b/package/network/utils/comgt/files/getimsi.gcom old mode 100755 new mode 100644 diff --git a/package/network/utils/comgt/files/getstrength.gcom b/package/network/utils/comgt/files/getstrength.gcom old mode 100755 new mode 100644 diff --git a/package/network/utils/comgt/files/ncm.json b/package/network/utils/comgt/files/ncm.json old mode 100755 new mode 100644 diff --git a/package/network/utils/comgt/files/ncm.sh b/package/network/utils/comgt/files/ncm.sh index 60b39655ec..9aaaa25f37 100755 --- a/package/network/utils/comgt/files/ncm.sh +++ b/package/network/utils/comgt/files/ncm.sh @@ -146,12 +146,18 @@ proto_ncm_setup() { proto_close_data proto_send_update "$interface" + local zone="$(fw3 -q network "$interface" 2>/dev/null)" + [ "$pdptype" = "IP" -o "$pdptype" = "IPV4V6" ] && { json_init json_add_string name "${interface}_4" json_add_string ifname "@$interface" json_add_string proto "dhcp" proto_add_dynamic_defaults + [ -n "$zone" ] && { + json_add_string zone "$zone" + } + json_close_object ubus call network add_dynamic "$(json_dump)" } @@ -162,6 +168,10 @@ proto_ncm_setup() { json_add_string proto "dhcpv6" json_add_string extendprefix 1 proto_add_dynamic_defaults + [ -n "$zone" ] && { + json_add_string zone "$zone" + } + json_close_object ubus call network add_dynamic "$(json_dump)" } diff --git a/package/network/utils/comgt/files/runcommand.gcom b/package/network/utils/comgt/files/runcommand.gcom old mode 100755 new mode 100644 diff --git a/package/network/utils/comgt/files/setmode.gcom b/package/network/utils/comgt/files/setmode.gcom old mode 100755 new mode 100644 diff --git a/package/network/utils/comgt/files/setpin.gcom b/package/network/utils/comgt/files/setpin.gcom old mode 100755 new mode 100644