Always use eth0 address as primary address on x86 and brcm2708

These targets don't have a WLAN adapter by default, so it doesn't make
sense to default to the phy0 address.
This commit is contained in:
Matthias Schiffer 2015-07-10 20:22:27 +02:00
parent cb40f149f3
commit d386ccdcf8

View File

@ -15,19 +15,18 @@ local util = require 'luci.util'
local try_files = { local try_files = {
'/sys/class/ieee80211/phy0/macaddress', '/sys/class/net/eth0/address'
'/sys/class/net/eth0/address',
} }
if not util.contains({'x86', 'brcm2708'}, platform.get_target()) then
table.insert(try_files, 1, '/sys/class/ieee80211/phy0/macaddress')
end
if platform.match('ar71xx', 'generic', {'tl-wdr3600', 'tl-wdr4300'}) then if platform.match('ar71xx', 'generic', {'tl-wdr3600', 'tl-wdr4300'}) then
table.insert(try_files, 1, '/sys/class/ieee80211/phy1/macaddress') table.insert(try_files, 1, '/sys/class/ieee80211/phy1/macaddress')
end elseif platform.match('ar71xx', 'generic', {'unifi-outdoor-plus'}) then
if platform.match('ar71xx', 'generic', {'unifi-outdoor-plus'}) then
table.insert(try_files, 1, '/sys/class/net/eth0/address') table.insert(try_files, 1, '/sys/class/net/eth0/address')
end elseif platform.match('ar71xx', 'generic', {'archer-c5', 'archer-c7'}) then
if platform.match('ar71xx', 'generic', {'archer-c5', 'archer-c7'}) then
table.insert(try_files, 1, '/sys/class/net/eth1/address') table.insert(try_files, 1, '/sys/class/net/eth1/address')
end end