aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2005-09-01 23:50:58 +0000
committerFelix Fietkau <nbd@openwrt.org>2005-09-01 23:50:58 +0000
commit73c103da66acba6cb723b6eafbae716b9ad6bddc (patch)
tree32545e9f829332ac9c01212f86896fe0e6ba617e
parent1bb2b656e5a91e007db4800d95f1acb15cea613f (diff)
downloadupstream-73c103da66acba6cb723b6eafbae716b9ad6bddc.tar.gz
upstream-73c103da66acba6cb723b6eafbae716b9ad6bddc.tar.bz2
upstream-73c103da66acba6cb723b6eafbae716b9ad6bddc.zip
fix lan_hwaddr in network overrides when there's more than one maca entry in adam2 configspace
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@1826 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--openwrt/target/linux/package/openwrt/files/ar7/etc/network.overrides1
1 files changed, 1 insertions, 0 deletions
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 9c0e8140597..76c3da3685f 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