add ipv6 support to network scripts (#101)

[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 0417b39..187b937 100644 (file)
--- a/package/base-files/default/etc/hotplug.d/net/10-net
+++ b/package/base-files/default/etc/hotplug.d/net/10-net
@@ -7,11 +7,19 @@ setup_eth()
        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"
+               }
        done
 }
 
@@ -55,16 +63,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
                        }