fix error messages

[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 9a4c450..4579a84 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,30 +1,10 @@
 #!/bin/sh
 setup_eth()
 {
-       for part in $(nvram get unused_ifnames); do
-               [ "$part" = "$INTERFACE" ] && return 0
+       for part in $(nvram get unused_ifnames); do
+               [ "$part" = "$INTERFACE" ] && exit 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" ] && {
-                       $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
 }
 
 find_name()
@@ -46,7 +26,7 @@ find_name()
                                }
                        ;;
                        *)
-                               [ "$(nvram get ${IFPROTO}_ifname)" = "$INTERFACE" \
+                               [ "$(nvram get ${IFTYPE}_device)" = "$INTERFACE" \
                                  -a -x /sbin/ifup.${IFPROTO} ] && return 0
                        ;;
                esac
@@ -95,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 &"
-                       oldpid=$(cat $pidfile)
                        ${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
                ;;
                *)