nils/gluon
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

gluon-core: fix handling of multi-port interfaces

Browse Source 
Multi-port interfaces are stored in the network config as an array using
the ports key.
This commit is contained in:
David Bauer 2021-06-26 19:36:59 +02:00
parent 98b16933d3
commit 69ba8e3cfe
1 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
package/gluon-core/luasrc/lib/gluon/upgrade/020-interfaces
View File

@ -20,17 +20,35 @@ local network_data = (board_data or {}).network
local function iface_exists(ifaces) local function iface_exists(ifaces)
if not ifaces then return nil end if not ifaces then return nil end
local ifnames = table.concat(ifaces, ' ')
for iface in ifaces:gmatch('%S+') do for _, iface in ipairs(ifaces) do
if unistd.access('/sys/class/net/' .. iface:gsub('%..*$', '')) then if unistd.access('/sys/class/net/' .. iface:gsub('%..*$', '')) then
return ifaces return ifnames
end end
end end
end end
local lan_data = network_data.lan or {}
local wan_data = network_data.wan or {}
local lan_ifname = iface_exists((network_data.lan or {}).device) local lan_interfaces = lan_data.ports
local wan_ifname = iface_exists((network_data.wan or {}).device) local wan_interfaces = wan_data.ports
-- In case we have a single port for either WAN or LAN,
-- add it to the respective empty table, as devices and
-- ports is XOR in board.json
if lan_data.device ~= nil then
lan_interfaces = {lan_data.device}
end
if wan_data.device ~= nil then
wan_interfaces = {wan_data.device}
end
local lan_ifname = iface_exists(lan_interfaces)
local wan_ifname = iface_exists(wan_interfaces)
if platform.match('ar71xx', 'generic', { if platform.match('ar71xx', 'generic', {
'cpe210', 'cpe210',