Added vlan enabling as suggested in #204, closes #204

[openwrt.git] / 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 fb7b128..9a4c450 100644 (file)
--- a/package/base-files/default/etc/hotplug.d/net/10-net
+++ b/package/base-files/default/etc/hotplug.d/net/10-net
@@ -1,6 +1,9 @@
 #!/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
        }
@@ -19,6 +22,7 @@ setup_eth()
                        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
 }
@@ -63,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
                        }