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

static-ip make it work

Browse Source
This commit is contained in:
Maciej Krüger 2021-12-15 09:10:17 +01:00 committed by Alexander List
parent 0810a08519
commit 6424501645
1 changed files with 7 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
package/gluon-static-ip/luasrc/lib/gluon/upgrade/240-static-ip
View File

@ -33,13 +33,16 @@ local function static_ip_4(name, ifname, macaddr, actually_use)
end end
if actually_use then if actually_use then
ip4 = ip.IPv4(static4) ip4 = ip.new(static4)
-- uci:set('network', name, 'proto', 'static') -- we have to set proto to static as otherwise we won't have the ip assigned
-- TODO: maybe modify the protos instead to allow reading static ips and using them?
-- NOTE: wan also uses dhcp/static directly
uci:set('network', name, 'proto', 'static')
uci:set('network', name, 'ipaddr', ip4:host():string()) uci:set('network', name, 'ipaddr', ip4:host():string())
uci:set('network', name, 'netmask', ip4:mask():string()) uci:set('network', name, 'netmask', ip4:mask():string())
else else
if uci:get('network', name, 'ipaddr') == static4 then if uci:get('network', name, 'proto') == 'static' then
-- uci:del('network', name, 'proto') uci:del('network', name, 'proto')
uci:del('network', name, 'ipaddr') uci:del('network', name, 'ipaddr')
uci:del('network', name, 'netmask') uci:del('network', name, 'netmask')
end end
@ -50,16 +53,10 @@ wireless.foreach_radio(uci, function(radio, index, config)
net = 'mesh_' .. radio['.name'] net = 'mesh_' .. radio['.name']
if uci:get('network', net, 'proto') == nil then if uci:get('network', net, 'proto') == nil then
-- uci:section('network', 'device', {
-- type = 'bridge',
-- name = net,
-- bridge_empty = '1',
-- })
uci:section('network', 'interface', net, { uci:section('network', 'interface', net, {
proto = 'static', proto = 'static',
type = 'bridge', type = 'bridge',
ifname = net, ifname = net,
-- device = net,
}) })
end end