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

gluon-static-ip: use gluon protos

Browse Source
This commit is contained in:
Maciej Krüger 2022-05-16 09:41:32 +02:00 committed by Alexander List
parent 8ce65a9cf1
commit 49e60861b1
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
package/gluon-static-ip/luasrc/lib/gluon/upgrade/540-static-ip
View File

@ -114,8 +114,7 @@ local function static_ip(name, ifname, macaddr, actually_use)
return return
end end
uci:set('network', name, 'ipaddr', ip4:host():string()) uci:set('network', name, 'ipaddr', ip4:string())
uci:set('network', name, 'netmask', ip4:mask():string())
elseif name ~= 'loopback' then elseif name ~= 'loopback' then
if uci:get('network', name, 'ipaddr') then if uci:get('network', name, 'ipaddr') then
uci:del('network', name, 'ipaddr') uci:del('network', name, 'ipaddr')
@ -140,11 +139,12 @@ local function static_ip(name, ifname, macaddr, actually_use)
end end
end end
else else
if uci:get('network', name, 'proto') == 'static' then if uci:get('network', name, 'ip6addr') ~= nil then
uci:del('network', name, 'ipaddr')
uci:del('network', name, 'netmask')
uci:del('network', name, 'ip6addr') uci:del('network', name, 'ip6addr')
end end
if uci:get('network', name, 'ipaddr') ~= nil then
uci:del('network', name, 'ipaddr')
end
end end
end end