when changing the mac address of a bridge interface, keep member interface addresses...

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@21577 3c298f89-4303-0410-b956-a3cf2f4a3e73

diff --git a/package/base-files/files/lib/network/config.sh b/package/base-files/files/lib/network/config.sh
index 1a77145..32170bb 100755 (executable)
--- a/package/base-files/files/lib/network/config.sh
+++ b/package/base-files/files/lib/network/config.sh
@@ -144,6 +144,8 @@ prepare_interface() {
        config_get iftype "$config" type
        case "$iftype" in
                bridge)
        config_get iftype "$config" type
        case "$iftype" in
                bridge)

+                       local macaddr
+                       config_get macaddr "$config" macaddr

                        [ -x /usr/sbin/brctl ] && {
                                ifconfig "br-$config" 2>/dev/null >/dev/null && {
                                        local newdevs devices
                        [ -x /usr/sbin/brctl ] && {
                                ifconfig "br-$config" 2>/dev/null >/dev/null && {
                                        local newdevs devices


@@ -168,7 +170,7 @@ prepare_interface() {
                                        # result in another setup_interface() call, so we simply stop processing
                                        # the current event at this point.
                                }
                                        # 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
+                               ifconfig "$iface" ${macaddr:+hw ether "${macaddr}"} up 2>/dev/null >/dev/null

                                return 1
                        }
                ;;
                                return 1
                        }
                ;;