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

gluon-core: add single_as_lan option to configure a single ethernet port as LAN instead of WAN

Browse Source
This commit is contained in:
Matthias Schiffer 2017-02-10 22:48:23 +01:00
parent e39cbcbda1
commit 184cb1010d
No known key found for this signature in database
GPG Key ID: 16EF3F64CB201D9C
2 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
package/gluon-core/check_site.lua
View File

@ -70,3 +70,4 @@ end
need_boolean('mesh_on_wan', false) need_boolean('mesh_on_wan', false)
need_boolean('mesh_on_lan', false) need_boolean('mesh_on_lan', false)
need_boolean('single_as_lan', false)

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

@ -10,17 +10,24 @@ end
local util = require 'gluon.util' local util = require 'gluon.util'
local platform = require 'gluon.platform' local platform = require 'gluon.platform'
local site = require 'gluon.site_config'
local uci = require('simple-uci').cursor() local uci = require('simple-uci').cursor()
local function iface_exists(name) local function iface_exists(ifaces)
return util.exec('ip', 'link', 'show', 'dev', (name:gsub('%..*$', ''))) == 0 if not ifaces then return nil end
for iface in ifaces:gmatch('%S+') do
if util.exec('ip', 'link', 'show', 'dev', (iface:gsub('%..*$', ''))) == 0 then
return ifaces
end
end
end end
local lan_ifname = uci:get('network', 'lan', 'ifname') local lan_ifname = iface_exists(uci:get('network', 'lan', 'ifname'))
local wan_ifname = uci:get('network', 'wan', 'ifname') local wan_ifname = iface_exists(uci:get('network', 'wan', 'ifname'))
if platform.match('ar71xx', 'generic', { if platform.match('ar71xx', 'generic', {
'cpe210', 'cpe210',
@ -36,11 +43,16 @@ if platform.match('ar71xx', 'generic', {
lan_ifname, wan_ifname = wan_ifname, lan_ifname lan_ifname, wan_ifname = wan_ifname, lan_ifname
end end
if wan_ifname and iface_exists(wan_ifname) then if wan_ifname and lan_ifname then
sysconfig.wan_ifname = wan_ifname sysconfig.wan_ifname = wan_ifname
sysconfig.lan_ifname = lan_ifname sysconfig.lan_ifname = lan_ifname
else else
sysconfig.wan_ifname = lan_ifname local single_ifname = lan_ifname or wan_ifname
if site.single_as_lan then
sysconfig.lan_ifname = single_ifname
else
sysconfig.wan_ifname = single_ifname
end
end end