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

gluon-core: nicer indentation of /lib/gluon/upgrade/020-interfaces

Browse Source
This commit is contained in:
Matthias Schiffer 2017-02-10 21:27:39 +01:00
parent e5cb125737
commit ea12cb770d
No known key found for this signature in database
GPG Key ID: 16EF3F64CB201D9C
1 changed files with 41 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1,35 +1,50 @@
#!/usr/bin/lua
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 uci = require('simple-uci').cursor()
if not (sysconfig.lan_ifname or sysconfig.wan_ifname) then
local function iface_exists(name)
return (gluon_util.exec('ip', 'link', 'show', 'dev', (name:gsub('%..*$', ''))) == 0)
end
local function iface_exists(name)
return 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')
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
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
end
if wan_ifname and iface_exists(wan_ifname) then
if wan_ifname and iface_exists(wan_ifname) then
sysconfig.wan_ifname = wan_ifname
sysconfig.lan_ifname = lan_ifname
else
else
sysconfig.wan_ifname = lan_ifname
end
uci:delete('network', 'lan')
uci:delete('network', 'wan')
uci:save('network')
end
uci:delete('network', 'lan')
uci:delete('network', 'wan')
uci:save('network')