cleanup MTD option handling

[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 13e1980..d0aa33d 100755 (executable)
--- a/package/base-files/files/lib/network/config.sh
+++ b/package/base-files/files/lib/network/config.sh
@@ -83,6 +83,7 @@ sort_list() {
 prepare_interface() {
        local iface="$1"
        local config="$2"
+       local vifmac="$3"
 
        # 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
@@ -90,9 +91,15 @@ prepare_interface() {
        [ "br-$config" = "$iface" -o -e "$iface" ] && return 0;
        
        ifconfig "$iface" 2>/dev/null >/dev/null && {
-               # make sure the interface is removed from any existing bridge and brought down
-               ifconfig "$iface" down
+               # make sure the interface is removed from any existing bridge and deconfigured 
+               ifconfig "$iface" 0.0.0.0
                unbridge "$iface"
+
+               # Change interface MAC address if requested
+               [ -n "$vifmac" ] && {
+                       ifconfig "$iface" down
+                       ifconfig "$iface" hw ether "$vifmac" up
+               }
        }
 
        # Setup VLAN interfaces
@@ -120,7 +127,7 @@ prepare_interface() {
                                        $DEBUG brctl setfd "br-$config" 0
                                        $DEBUG ifconfig "br-$config" up
                                        $DEBUG brctl addif "br-$config" "$iface"
-                                       $DEBUG brctl stp "br-$config" ${stp:-off}
+                                       $DEBUG brctl stp "br-$config" ${stp:-0}
                                        # 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.
@@ -142,6 +149,10 @@ set_interface_ifname() {
        uci_set_state network "$config" device "$device"
 }
 
+setup_interface_none() {
+       env -i ACTION="ifup" INTERFACE="$2" DEVICE="$1" PROTO=none /sbin/hotplug-call "iface" &
+}
+
 setup_interface_static() {
        local iface="$1"
        local config="$2"
@@ -168,6 +179,9 @@ setup_interface_static() {
                done
        }
 
+       config_get type "$config" TYPE                                                                               
+       [ "$type" = "alias" ] && return 0
+
        env -i ACTION="ifup" INTERFACE="$config" DEVICE="$iface" PROTO=static /sbin/hotplug-call "iface" &
 }
 
@@ -205,6 +219,7 @@ setup_interface_alias() {
 setup_interface() {
        local iface="$1"
        local config="$2"
+       local vifmac="$4"
        local proto
        local macaddr
 
@@ -214,7 +229,7 @@ setup_interface() {
        }
        proto="${3:-$(config_get "$config" proto)}"
        
-       prepare_interface "$iface" "$config" || return 0
+       prepare_interface "$iface" "$config" "$vifmac" || return 0
        
        [ "$iface" = "br-$config" ] && {
                # need to bring up the bridge and wait a second for 
@@ -228,6 +243,7 @@ setup_interface() {
        config_get mtu "$config" mtu
        config_get macaddr "$config" macaddr
        grep "$iface:" /proc/net/dev > /dev/null && \
+               $DEBUG ifconfig "$iface" down && \
                $DEBUG ifconfig "$iface" ${macaddr:+hw ether "$macaddr"} ${mtu:+mtu $mtu} up
        set_interface_ifname "$config" "$iface"
 
@@ -259,6 +275,9 @@ setup_interface() {
                                lock -u "/var/lock/dhcp-$iface"
                        fi
                ;;
+               none)
+                       setup_interface_none "$iface" "$config"
+               ;;
                *)
                        if ( eval "type setup_interface_$proto" ) >/dev/null 2>/dev/null; then
                                eval "setup_interface_$proto '$iface' '$config' '$proto'"