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

gluon-client-bridge: don't depend on luci.ip

Browse Source
This commit is contained in:
Matthias Schiffer 2017-01-19 17:19:37 +01:00
parent e665bfe64a
commit 80de4a69e3
No known key found for this signature in database
GPG Key ID: 16EF3F64CB201D9C
1 changed files with 4 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
package/gluon-client-bridge/luasrc/lib/gluon/upgrade/300-gluon-client-bridge-network
View File

@ -4,15 +4,14 @@ local site = require 'gluon.site_config'
local sysconfig = require 'gluon.sysconfig' local sysconfig = require 'gluon.sysconfig'
local util = require 'gluon.util' local util = require 'gluon.util'
local ip = require 'luci.ip'
local uci = require('simple-uci').cursor() local uci = require('simple-uci').cursor()
local ip4, netmask, ip6 local ip4, ip6
if site.next_node.ip4 then if site.next_node.ip4 then
ip4 = site.next_node.ip4 local plen = site.prefix4:match('/%d+$')
netmask = ip.IPv4(site.prefix4):mask():string() ip4 = site.next_node.ip4 .. plen
end end
if site.next_node.ip6 then if site.next_node.ip6 then
@ -25,7 +24,6 @@ uci:section('network', 'interface', 'client',
proto = 'static', proto = 'static',
macaddr = site.next_node.mac, macaddr = site.next_node.mac,
ipaddr = ip4, ipaddr = ip4,
netmask = netmask,
ip6addr = ip6, ip6addr = ip6,
} }
) )
@ -33,6 +31,7 @@ uci:section('network', 'interface', 'client',
uci:delete('network', 'client', 'reqprefix') uci:delete('network', 'client', 'reqprefix')
uci:delete('network', 'client', 'peerdns') uci:delete('network', 'client', 'peerdns')
uci:delete('network', 'client', 'sourcefilter') uci:delete('network', 'client', 'sourcefilter')
uci:delete('network', 'client', 'netmask')
local interfaces = uci:get('network', 'client', 'ifname') or {} local interfaces = uci:get('network', 'client', 'ifname') or {}