use /tmp/resolv.conf when using a static nameserver (#177)

[openwrt.git] / openwrt / package / base-files / default / etc / hotplug.d / net / 10-net

diff --git a/openwrt/package/base-files/default/etc/hotplug.d/net/10-net b/openwrt/package/base-files/default/etc/hotplug.d/net/10-net
index 3bc980f..7c8cd67 100644 (file)
--- a/openwrt/package/base-files/default/etc/hotplug.d/net/10-net
+++ b/openwrt/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
 }
 
@@ -23,22 +31,21 @@ find_name()
                IFTYPE="${ifname}"
                IFPROTO="$(nvram get ${IFTYPE}_proto)"
                IFACE="$(nvram get ${IFTYPE}_ifname)"
-               [ -z "$IFPROTO" -o "$IFPROTO" = "none" ] || {
-                       [ "${IFACE}" = "$INTERFACE" ] && return 0
-                       case "$IFPROTO" in
-                               static|dhcp)
-                                       [ "${IFACE%%[0-9]*}" = "br" ] && {
-                                               for part in $(nvram get ${IFTYPE}_ifnames); do
-                                                       [ "$part" = "$INTERFACE" ] && return 0
-                                               done
-                                       }
-                               ;;
-                               *)
-                                       [ "$(nvram get ${IFPROTO}_ifname)" = "$INTERFACE" \
-                                         -a -x /sbin/ifup.${IFPROTO} ] && return 0
-                               ;;
-                       esac
-               }
+               case "$IFPROTO" in
+                       ""|none);;
+                       static|dhcp)
+                               [ "${IFACE}" = "$INTERFACE" ] && return 0
+                               [ "${IFACE%%[0-9]*}" = "br" ] && {
+                                       for part in $(nvram get ${IFTYPE}_ifnames); do
+                                               [ "$part" = "$INTERFACE" ] && return 0
+                                       done
+                               }
+                       ;;
+                       *)
+                               [ "$(nvram get ${IFPROTO}_ifname)" = "$INTERFACE" \
+                                 -a -x /sbin/ifup.${IFPROTO} ] && return 0
+                       ;;
+               esac
        done
        IFACE=""
        IFTYPE=""
@@ -62,10 +69,10 @@ do_ifup() {
                        $DEBUG ifconfig $if $ip ${netmask:+netmask $netmask} broadcast + up
                        ${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
                        }
                        
@@ -155,13 +162,12 @@ do_register()
                                do_ifup "$IFPROTO" "$IFTYPE" "$if"
                        fi
                }
-       else
-               do_ifup "$IFPROTO" "$IFTYPE" "$if"
+       else 
+               [ "${INTERFACE%%[0-9]*}" = "ppp" ] || do_ifup "$IFPROTO" "$IFTYPE" "$if"
        fi
 }
 
 do_unregister() {
-       [ "${INTERFACE%%[0-9]*}" = "atm" ] || ifconfig "$INTERFACE" 0.0.0.0 down 2>&-
        [ -z "$IFTYPE" -o -z "$IFPROTO" ] && find_name
        [ -z "$IFTYPE" -o -z "$IFPROTO" ] && return 0
        
@@ -175,16 +181,17 @@ do_unregister() {
        
        case "$IFPROTO" in
                pppoe|pppoa|pptp) 
-                       killall ifup.${IFPROTO} 2>&- >&-
                        killall pppd 2>&- >&-
                ;;
                dhcp)
                        [ -f /var/run/${INTERFACE}.pid ] && kill "$(cat /var/run/${INTERFACE}.pid)" 2>&- >&-
                ;;
        esac
+
+       [ "${INTERFACE%%[0-9]*}" = "atm" ] || ifconfig "$INTERFACE" 0.0.0.0 down 2>&-
 }
 
 case "$ACTION" in
-       register) do_register;;
-       unregister) do_unregister;;
+       add|register) do_register;;
+       remove|unregister) do_unregister;;
 esac