base-files: fix brcm-2.4 issues in r26991
authorFelix Fietkau <nbd@openwrt.org>
Tue, 24 May 2011 09:37:32 +0000 (09:37 +0000)
committerFelix Fietkau <nbd@openwrt.org>
Tue, 24 May 2011 09:37:32 +0000 (09:37 +0000)
SVN-Revision: 26992

package/base-files/files/lib/network/config.sh

index 12e4912c01525c4b01aac9722f42ef11fa11c4fc..be431e63747e8502a68156ea00fe0a3f22c316d1 100755 (executable)
@@ -190,8 +190,8 @@ prepare_interface() {
                                        $DEBUG do_sysctl "net.ipv6.conf.$iface.disable_ipv6" 1
                                        $DEBUG brctl addif "br-$config" "$iface"
                                        $DEBUG brctl stp "br-$config" $stp
-                                       [ -z "$macaddr" ] && macaddr="$(cat /sys/class/net/$iface/address)"
-                                       $DEBUG ifconfig "br-$config" hw ether $macaddr up
+                                       [ -z "$macaddr" -a -e "/sys/class/net/$iface/address" ] && macaddr="$(cat /sys/class/net/$iface/address)"
+                                       $DEBUG ifconfig "br-$config" ${macaddr:+hw ether "${macaddr}"} up
                                        # 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.