summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authornbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2005-09-01 23:50:58 +0000
committernbd <nbd@3c298f89-4303-0410-b956-a3cf2f4a3e73>2005-09-01 23:50:58 +0000
commitb6dde13e8f4ba4801e9a014b675f3531e9b16be6 (patch)
tree7bb1f34657e2ec57d39c685d620601365aa8b7dd
parentf22255f8ee87b9677447fb7bd7461a55f6bbb010 (diff)
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/openwrt@1826 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--target/linux/package/openwrt/files/ar7/etc/network.overrides1
1 files changed, 1 insertions, 0 deletions
diff --git a/target/linux/package/openwrt/files/ar7/etc/network.overrides b/target/linux/package/openwrt/files/ar7/etc/network.overrides
index 9c0e81405..76c3da368 100644
--- a/target/linux/package/openwrt/files/ar7/etc/network.overrides
+++ b/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