From 96026078c087dd20a99ac3c912ba1407f442ae10 Mon Sep 17 00:00:00 2001 From: Roman Yeryomin Date: Tue, 15 Jan 2013 22:39:09 +0200 Subject: fix network config, hotplug usb script and query3g Makefile for 3g autodetection Signed-off-by: Roman Yeryomin --- package/network/utils/comgt/files/3g.usb | 6 ++++-- package/query3g/Makefile | 7 +++++-- target/linux/realtek/base-files/etc/config/network | 6 ++---- 3 files changed, 11 insertions(+), 8 deletions(-) diff --git a/package/network/utils/comgt/files/3g.usb b/package/network/utils/comgt/files/3g.usb index fd6837e65..0a443f602 100644 --- a/package/network/utils/comgt/files/3g.usb +++ b/package/network/utils/comgt/files/3g.usb @@ -24,10 +24,12 @@ find_3g_iface() { } case "$DEVICENAME" in - tty*) + ttyUSB0) [ -e "/dev/$DEVICENAME" ] || [ "$ACTION" = remove ] || exit 0 + luci-3g-detect detect + query3g_setup config_load network config_foreach find_3g_iface interface "/dev/$DEVICENAME" + ifdown wan && ifup wan ;; esac - diff --git a/package/query3g/Makefile b/package/query3g/Makefile index f18e09903..c0eaddc03 100644 --- a/package/query3g/Makefile +++ b/package/query3g/Makefile @@ -15,7 +15,7 @@ include $(INCLUDE_DIR)/package.mk define Package/query3g SECTION:=utils CATEGORY:=Utilities - DEPENDS:=+usbreset +comgt + DEPENDS:=+usbreset +comgt +luci-lib-web TITLE:=Utility to find 3G dongle information MAINTAINER:=Jo-Philipp Wich endef @@ -30,8 +30,11 @@ endef define Package/query3g/install $(INSTALL_DIR) $(1)/usr/bin $(INSTALL_BIN) ./files/query3g.sh $(1)/usr/bin/query3g + $(INSTALL_BIN) ./files/query3g_setup.sh $(1)/usr/bin/query3g_setup + $(INSTALL_DIR) $(1)/sbin + $(INSTALL_BIN) ./files/luci-3g-detect $(1)/sbin/ $(INSTALL_DIR) $(1)/usr/share - $(INSTALL_DATA) ./files/query3g.gcom $(1)/usr/share/query3g.gcom + $(INSTALL_DATA) ./files/query3g.gcom $(1)/usr/share/query3g.gcom endef $(eval $(call BuildPackage,query3g)) diff --git a/target/linux/realtek/base-files/etc/config/network b/target/linux/realtek/base-files/etc/config/network index 19c85f8f9..f1bab0f8c 100644 --- a/target/linux/realtek/base-files/etc/config/network +++ b/target/linux/realtek/base-files/etc/config/network @@ -5,12 +5,10 @@ config interface loopback option netmask 255.0.0.0 config interface lan - option ifname "eth0 eth2 eth3 eth4" + option ifname "eth0 eth1 eth2 eth3 eth4" option type bridge option proto static option ipaddr 192.168.2.1 option netmask 255.255.255.0 - + config interface wan - option ifname eth1 - option proto dhcp -- cgit v1.2.3