gluon-core: nicer indentation of /lib/gluon/upgrade/020-interfaces
This commit is contained in:
parent
e5cb125737
commit
ea12cb770d
@ -1,35 +1,50 @@
|
|||||||
#!/usr/bin/lua
|
#!/usr/bin/lua
|
||||||
|
|
||||||
local sysconfig = require 'gluon.sysconfig'
|
local sysconfig = require 'gluon.sysconfig'
|
||||||
local gluon_util = require 'gluon.util'
|
|
||||||
|
-- Are we already set up?
|
||||||
|
if sysconfig.lan_ifname or sysconfig.wan_ifname then
|
||||||
|
os.exit(0)
|
||||||
|
end
|
||||||
|
|
||||||
|
|
||||||
|
local util = require 'gluon.util'
|
||||||
local platform = require 'gluon.platform'
|
local platform = require 'gluon.platform'
|
||||||
|
|
||||||
local uci = require('simple-uci').cursor()
|
local uci = require('simple-uci').cursor()
|
||||||
|
|
||||||
|
|
||||||
if not (sysconfig.lan_ifname or sysconfig.wan_ifname) then
|
local function iface_exists(name)
|
||||||
local function iface_exists(name)
|
return util.exec('ip', 'link', 'show', 'dev', (name:gsub('%..*$', ''))) == 0
|
||||||
return (gluon_util.exec('ip', 'link', 'show', 'dev', (name:gsub('%..*$', ''))) == 0)
|
|
||||||
end
|
|
||||||
|
|
||||||
|
|
||||||
local lan_ifname = uci:get('network', 'lan', 'ifname')
|
|
||||||
local wan_ifname = uci:get('network', 'wan', 'ifname')
|
|
||||||
|
|
||||||
if platform.match('ar71xx', 'generic', {'cpe210', 'cpe510', 'wbs210', 'wbs510', 'nanostation-m', 'nanostation-m-xw', 'unifi-outdoor-plus', 'uap-pro', 'unifiac-pro'}) then
|
|
||||||
lan_ifname, wan_ifname = wan_ifname, lan_ifname
|
|
||||||
end
|
|
||||||
|
|
||||||
if wan_ifname and iface_exists(wan_ifname) then
|
|
||||||
sysconfig.wan_ifname = wan_ifname
|
|
||||||
sysconfig.lan_ifname = lan_ifname
|
|
||||||
else
|
|
||||||
sysconfig.wan_ifname = lan_ifname
|
|
||||||
end
|
|
||||||
|
|
||||||
|
|
||||||
uci:delete('network', 'lan')
|
|
||||||
uci:delete('network', 'wan')
|
|
||||||
|
|
||||||
uci:save('network')
|
|
||||||
end
|
end
|
||||||
|
|
||||||
|
|
||||||
|
local lan_ifname = uci:get('network', 'lan', 'ifname')
|
||||||
|
local wan_ifname = uci:get('network', 'wan', 'ifname')
|
||||||
|
|
||||||
|
if platform.match('ar71xx', 'generic', {
|
||||||
|
'cpe210',
|
||||||
|
'cpe510',
|
||||||
|
'wbs210',
|
||||||
|
'wbs510',
|
||||||
|
'nanostation-m',
|
||||||
|
'nanostation-m-xw',
|
||||||
|
'unifi-outdoor-plus',
|
||||||
|
'uap-pro',
|
||||||
|
'unifiac-pro',
|
||||||
|
}) then
|
||||||
|
lan_ifname, wan_ifname = wan_ifname, lan_ifname
|
||||||
|
end
|
||||||
|
|
||||||
|
if wan_ifname and iface_exists(wan_ifname) then
|
||||||
|
sysconfig.wan_ifname = wan_ifname
|
||||||
|
sysconfig.lan_ifname = lan_ifname
|
||||||
|
else
|
||||||
|
sysconfig.wan_ifname = lan_ifname
|
||||||
|
end
|
||||||
|
|
||||||
|
|
||||||
|
uci:delete('network', 'lan')
|
||||||
|
uci:delete('network', 'wan')
|
||||||
|
|
||||||
|
uci:save('network')
|
||||||
|
Loading…
Reference in New Issue
Block a user