fix lan_hwaddr in network overrides when there's more than one maca entry in adam2...

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

diff --git a/openwrt/target/linux/package/openwrt/files/ar7/etc/network.overrides b/openwrt/target/linux/package/openwrt/files/ar7/etc/network.overrides
index 9c0e814..76c3da3 100644 (file)
--- a/openwrt/target/linux/package/openwrt/files/ar7/etc/network.overrides
+++ b/openwrt/target/linux/package/openwrt/files/ar7/etc/network.overrides
@@ -12,6 +12,7 @@ DEFAULT_lan_ifnames="eth0"
 DEFAULT_lan_ipaddr=${BR2_SYSCONF_FAILSAFE_IP:-"192.168.1.1"}
 DEFAULT_lan_netmask=${BR2_SYSCONF_FAILSAFE_NETMASK:-"255.255.255.0"}
 DEFAULT_lan_hwaddr=$(strings /dev/mtdblock/3 | grep -A1 maca | grep :)
 DEFAULT_lan_ipaddr=${BR2_SYSCONF_FAILSAFE_IP:-"192.168.1.1"}
 DEFAULT_lan_netmask=${BR2_SYSCONF_FAILSAFE_NETMASK:-"255.255.255.0"}
 DEFAULT_lan_hwaddr=$(strings /dev/mtdblock/3 | grep -A1 maca | grep :)

+DEFAULT_lan_hwaddr=${DEFAULT_lan_hwaddr%% *}

 DEFAULT_lan_hwaddr=${DEFAULT_lan_hwaddr:-${BR2_SYSCONF_FAILSAFE_MAC:-"00:0B:AD:0A:DD:00"}}
 
 # failsafe if reset is held
 DEFAULT_lan_hwaddr=${DEFAULT_lan_hwaddr:-${BR2_SYSCONF_FAILSAFE_MAC:-"00:0B:AD:0A:DD:00"}}
 
 # failsafe if reset is held