Mirrors
/
aredn
mirror of https://github.com/aredn/aredn.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Only one device name per interface name (some devices have 2)

This commit is contained in:
Tim Wilkinson 2022-03-01 22:18:11 -08:00 committed by Joe AE6XE
parent 6877cb326f
commit 7b48dc3200
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
files/usr/lib/lua/aredn/hardware.lua
View File

@ -144,7 +144,7 @@ function hardware.get_iface_name(name)
return "eth0.2"
end
-- Maybe the board knows
return hardware.get_board().network[name].ifname
return hardware.get_board().network[name].ifname:match("^(%S+)")
end
function hardware.get_link_led()

2
files/usr/local/bin/node-setup
View File

@ -81,7 +81,7 @@ if not (config == "mesh" and nixio.fs.access("/etc/config.mesh/_setup", "r")) th
return -1
end
local lanintf = aredn.hardware.get_board().network.lan.ifname
local lanintf = aredn.hardware.get_board().network.lan.ifname:match("^(%S+)")
local node = aredn_info.get_nvram("node")
local tactical = aredn_info.get_nvram("tactical")
local mac2 = mac_to_ip(aredn.hardware.get_interface_mac(aredn.hardware.get_iface_name("wifi")), 0)