update wrt54g3g pattern version, add wrt54g3g-em pattern (#2663)

[openwrt.git] / package / base-files / files / lib / network / config.sh

diff --git a/package/base-files/files/lib/network/config.sh b/package/base-files/files/lib/network/config.sh
index c5334cb..f07d926 100755 (executable)
--- a/package/base-files/files/lib/network/config.sh
+++ b/package/base-files/files/lib/network/config.sh
@@ -13,7 +13,7 @@ find_config() {
                esac
                config_get device "$ifn" device
                for ifc in $device $iface $ifaces; do
-                       [ "$ifc" = "$1" ] && {
+                       [ ."$ifc" = ."$1" ] && {
                                echo "$ifn"
                                return 0
                        }
@@ -74,9 +74,7 @@ prepare_interface() {
        # if we're called for the bridge interface itself, don't bother trying
        # to create any interfaces here. The scripts have already done that, otherwise
        # the bridge interface wouldn't exist.
-       [ "$iface" = "br-$config" ] && return 0;
-
-       [ -f "$iface" ] && return 0;
+       [ "br-$config" = "$iface" -o -f "$iface" ] && return 0;
        
        ifconfig "$iface" 2>/dev/null >/dev/null && {
                # make sure the interface is removed from any existing bridge and brought down
@@ -90,21 +88,24 @@ prepare_interface() {
 
        # Setup bridging
        config_get iftype "$config" type
+       config_get stp "$config" stp
        case "$iftype" in
                bridge)
                        [ -x /usr/sbin/brctl ] && {
-                               ifconfig "$iface" up 2>/dev/null >/dev/null
                                ifconfig "br-$config" 2>/dev/null >/dev/null && {
                                        $DEBUG brctl addif "br-$config" "$iface"
                                        # Bridge existed already. No further processing necesary
                                } || {
                                        $DEBUG brctl addbr "br-$config"
                                        $DEBUG brctl setfd "br-$config" 0
+                                       $DEBUG ifconfig "br-$config" up
                                        $DEBUG brctl addif "br-$config" "$iface"
+                                       $DEBUG brctl stp "br-$config" ${stp:-off}
                                        # Creating the bridge here will have triggered a hotplug event, which will
                                        # result in another setup_interface() call, so we simply stop processing
                                        # the current event at this point.
                                }
+                               ifconfig "$iface" up 2>/dev/null >/dev/null
                                return 1
                        }
                ;;
@@ -138,6 +139,7 @@ setup_interface() {
        config_get mtu "$config" mtu
        config_get macaddr "$config" macaddr
        $DEBUG ifconfig "$iface" ${macaddr:+hw ether "$macaddr"} ${mtu:+mtu $mtu} up
+       uci set "/var/state/network.$config.ifname=$iface"
 
        pidfile="/var/run/$iface.pid"
        case "$proto" in
@@ -151,13 +153,14 @@ setup_interface() {
                        config_get dns "$config" dns
                        config_get bcast "$config" broadcast
                        
-                       [ -z "$ipaddr" ] || $DEBUG ifconfig "$iface" "$ipaddr" netmask "$netmask"
+                       [ -z "$ipaddr" ] || $DEBUG ifconfig "$iface" "$ipaddr" netmask "$netmask" broadcast "${bcast:-+}"
                        [ -z "$ip6addr" ] || $DEBUG ifconfig "$iface" add "$ip6addr"
                        [ -z "$gateway" ] || $DEBUG route add default gw "$gateway"
-                       [ -z "$bcast" ] || $DEBUG ifconfig "$iface" broadcast "$bcast"
-                       [ -z "$dns" -o -f /tmp/resolv.conf.auto ] || {
+                       [ -z "$dns" ] || {
                                for ns in $dns; do
-                                       echo "nameserver $ns" >> /tmp/resolv.conf.auto
+                                       grep "$ns" /tmp/resolv.conf.auto 2>/dev/null >/dev/null || {
+                                               echo "nameserver $ns" >> /tmp/resolv.conf.auto
+                                       }
                                done
                        }
 
@@ -176,13 +179,14 @@ setup_interface() {
                        config_get netmask "$config" netmask
                        config_get hostname "$config" hostname
                        config_get proto1 "$config" proto
+                       config_get clientid "$config" clientid
 
                        [ -z "$ipaddr" ] || \
                                $DEBUG ifconfig "$iface" "$ipaddr" ${netmask:+netmask "$netmask"}
 
                        # don't stay running in background if dhcp is not the main proto on the interface (e.g. when using pptp)
-                       [ "$proto1" != "$proto" ] && dhcpopts="-n -q"
-                       $DEBUG eval udhcpc -t 0 -i "$iface" ${ipaddr:+-r $ipaddr} ${hostname:+-H $hostname} -b -p "$pidfile" ${dhcpopts:- -R &}
+                       [ ."$proto1" != ."$proto" ] && dhcpopts="-n -q"
+                       $DEBUG eval udhcpc -t 0 -i "$iface" ${ipaddr:+-r $ipaddr} ${hostname:+-H $hostname} ${clientid:+-c $clientid} -b -p "$pidfile" ${dhcpopts:- -R &}
                        lock -u "/var/lock/dhcp-$iface"
                ;;
                *)