move sysfs to mount_root

[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 7c8cd67..0f384ec 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,26 +1,10 @@
 #!/bin/sh
 setup_eth()
 {
 #!/bin/sh
 setup_eth()
 {

-       [ -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" ] && {
-                       $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"
-               }
+       for part in $(nvram get unused_ifnames); do
+               [ "$part" = "$INTERFACE" ] && exit 0

        done
        done

+       ifconfig "$INTERFACE" up 2>&- >&-

 }
 
 find_name()
 }
 
 find_name()


@@ -42,7 +26,7 @@ find_name()
                                }
                        ;;
                        *)
                                }
                        ;;
                        *)

-                               [ "$(nvram get ${IFPROTO}_ifname)" = "$INTERFACE" \
+                               [ "$(nvram get ${IFTYPE}_device)" = "$INTERFACE" \

                                  -a -x /sbin/ifup.${IFPROTO} ] && return 0
                        ;;
                esac
                                  -a -x /sbin/ifup.${IFPROTO} ] && return 0
                        ;;
                esac


@@ -63,10 +47,13 @@ do_ifup() {
        case "$1" in
                static)
                        ip=$(nvram get ${2}_ipaddr)
        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
                        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 /tmp/resolv.conf ] || {
                        ${gateway:+$DEBUG route add default gw $gateway}
        
                        [ -f /tmp/resolv.conf ] || {


@@ -88,12 +75,7 @@ do_ifup() {
                        DHCP_HOSTNAME=${DHCP_HOSTNAME%%.*}
                        [ -z $DHCP_HOSTNAME ] || DHCP_ARGS="$DHCP_ARGS -H $DHCP_HOSTNAME"
                        [ "$if_proto" = "pptp" ] && DHCP_ARGS="$DHCP_ARGS -n -q" || DHCP_ARGS="$DHCP_ARGS -R &"
                        DHCP_HOSTNAME=${DHCP_HOSTNAME%%.*}
                        [ -z $DHCP_HOSTNAME ] || DHCP_ARGS="$DHCP_ARGS -H $DHCP_HOSTNAME"
                        [ "$if_proto" = "pptp" ] && DHCP_ARGS="$DHCP_ARGS -n -q" || DHCP_ARGS="$DHCP_ARGS -R &"

-                       oldpid=$(cat $pidfile)

                        ${DEBUG:-eval} "udhcpc $DHCP_ARGS"
                        ${DEBUG:-eval} "udhcpc $DHCP_ARGS"

-                       pidof udhcpc | grep "$oldpid" >&- 2>&- && {
-                               sleep 1
-                               kill -9 $oldpid
-                       }

                        # hotplug events are handled by /usr/share/udhcpc/default.script
                ;;
                *)
                        # hotplug events are handled by /usr/share/udhcpc/default.script
                ;;
                *)


@@ -157,7 +139,8 @@ do_register()
 
                        if [ "$INTERFACE" != "$if" ]; then
                                $DEBUG ifconfig "$INTERFACE" 0.0.0.0 up
 
                        if [ "$INTERFACE" != "$if" ]; then
                                $DEBUG ifconfig "$INTERFACE" 0.0.0.0 up

-                               brctl addif "$if" "$INTERFACE"
+                               $DEBUG brctl addif "$if" "$INTERFACE"
+                               $DEBUG ifconfig "$INTERFACE" allmulti

                        else
                                do_ifup "$IFPROTO" "$IFTYPE" "$if"
                        fi
                        else
                                do_ifup "$IFPROTO" "$IFTYPE" "$if"
                        fi