X-Git-Url: http://git.rohieb.name/openwrt.git/blobdiff_plain/9b89420f40284f666b61f5dcb402d8fb0c70a7ae..001c1d72f09c2145244816728d1700eca653af6d:/package/base-files/default/etc/hotplug.d/net/10-net

diff --git a/package/base-files/default/etc/hotplug.d/net/10-net b/package/base-files/default/etc/hotplug.d/net/10-net
index 0417b397f..9a4c45003 100644
--- a/package/base-files/default/etc/hotplug.d/net/10-net
+++ b/package/base-files/default/etc/hotplug.d/net/10-net
@@ -1,17 +1,29 @@
 #!/bin/sh
 setup_eth()
 {
+    	for part in $(nvram get unused_ifnames); do
+		[ "$part" = "$INTERFACE" ] && return 0
+	done
 	[ -f /proc/net/wl0 ] && {
 		lsmod | grep wlcompat >&- || insmod wlcompat
 	}
 	iwconfig "$INTERFACE" 2>&- | grep -v 'no wireless' >&- && {
 		/sbin/wifi
 	}
+	[ -d /proc/switch ] || {
+		insmod switch-core
+		insmod switch-robo || insmod switch-adm
+	}
 	if="$(echo "$INTERFACE" | sed s,eth,et,)"
 	ifconfig "$INTERFACE" up 2>&- >&-
 	for vlan in $(seq 0 15); do
-		[ "$(nvram get vlan${vlan}hwname)" = "$if" ] && \
+		[ "$(nvram get vlan${vlan}hwname)" = "$if" ] && {
 			$DEBUG vconfig add "$INTERFACE" "$vlan"
+			vports="$(nvram get vlan${vlan}ports)"
+			[ \! -z "$vports" -a -d "/proc/switch/$INTERFACE" ] && \
+				echo "$vports" > "/proc/switch/$INTERFACE/vlan/$vlan/ports"
+				echo "1" > "/proc/switch/$INTERFACE/enable_vlan"
+		}
 	done
 }
 
@@ -55,16 +67,19 @@ do_ifup() {
 	case "$1" in
 		static)
 			ip=$(nvram get ${2}_ipaddr)
+			ip6=$(nvram get ${2}_ip6addr)
 			netmask=$(nvram get ${2}_netmask)
 			gateway=$(nvram get ${2}_gateway)
 	
 			$DEBUG ifconfig $if $ip ${netmask:+netmask $netmask} broadcast + up
+			[ -n "$ip6" ] && $DEBUG ifconfig $if add $ip6
+
 			${gateway:+$DEBUG route add default gw $gateway}
 	
-			[ -f /etc/resolv.conf ] || {
-				debug "# --- creating /etc/resolv.conf ---"
+			[ -f /tmp/resolv.conf ] || {
+				debug "# --- creating /tmp/resolv.conf ---"
 				for dns in $(nvram get ${2}_dns); do
-					echo "nameserver $dns" >> /etc/resolv.conf
+					echo "nameserver $dns" >> /tmp/resolv.conf
 				done
 			}