From: jow <jow@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Fri, 28 May 2010 00:47:23 +0000 (+0000)
Subject: [backfire] merge r21588 and r21591
X-Git-Url: http://git.ozo.com/?a=commitdiff_plain;h=e7cb5d5226305fd3376d517b26214f9b79350305;p=openwrt-10.03%2F.git

[backfire] merge r21588 and r21591


git-svn-id: svn://svn.openwrt.org/openwrt/branches/backfire@21593 3c298f89-4303-0410-b956-a3cf2f4a3e73
---

diff --git a/package/base-files/files/etc/hotplug.d/net/10-net b/package/base-files/files/etc/hotplug.d/net/10-net
index 42ff29e79..0886c74c5 100644
--- a/package/base-files/files/etc/hotplug.d/net/10-net
+++ b/package/base-files/files/etc/hotplug.d/net/10-net
@@ -11,7 +11,7 @@ addif() {
 
 	# PPP devices are configured by pppd, no need to run setup_interface here
 	case "$INTERFACE" in
-		ppp*) return 0;;
+		ppp*|3g-*) return 0;;
 		ath*) return 0;;
 		wlan*) return 0;;
 	esac
diff --git a/package/base-files/files/etc/init.d/network b/package/base-files/files/etc/init.d/network
index d60d41a64..9d4904ae4 100755
--- a/package/base-files/files/etc/init.d/network
+++ b/package/base-files/files/etc/init.d/network
@@ -23,7 +23,10 @@ boot() {
 		local proto
 		config_get proto "$ifc" proto
 
-		type "coldplug_interface_$proto" >/dev/null && \
+		local auto
+		config_get_bool auto "$ifc" auto 1
+
+		type "coldplug_interface_$proto" >/dev/null && [ "$auto" = 1 ] && \
 			coldplug_interface_$proto "$ifc"
 	done
 }