From: Felix Fietkau Date: Thu, 1 Sep 2005 23:50:58 +0000 (+0000) Subject: fix lan_hwaddr in network overrides when there's more than one maca entry in adam2... X-Git-Tag: reboot~32103 X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=6a5916f4a87ecb16d4fc2ab81c9b8655a7aadd73;p=openwrt%2Fstaging%2Fnoltari.git fix lan_hwaddr in network overrides when there's more than one maca entry in adam2 configspace SVN-Revision: 1826 --- 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 9c0e814059..76c3da3685 100644 --- 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_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