From 80de4a69e3366be6b09df9e3d37afa5e786ccd92 Mon Sep 17 00:00:00 2001 From: Matthias Schiffer Date: Thu, 19 Jan 2017 17:19:37 +0100 Subject: [PATCH] gluon-client-bridge: don't depend on luci.ip --- .../lib/gluon/upgrade/300-gluon-client-bridge-network | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/package/gluon-client-bridge/luasrc/lib/gluon/upgrade/300-gluon-client-bridge-network b/package/gluon-client-bridge/luasrc/lib/gluon/upgrade/300-gluon-client-bridge-network index bc3139a2..8dae7e6d 100755 --- a/package/gluon-client-bridge/luasrc/lib/gluon/upgrade/300-gluon-client-bridge-network +++ b/package/gluon-client-bridge/luasrc/lib/gluon/upgrade/300-gluon-client-bridge-network @@ -4,15 +4,14 @@ local site = require 'gluon.site_config' local sysconfig = require 'gluon.sysconfig' local util = require 'gluon.util' -local ip = require 'luci.ip' local uci = require('simple-uci').cursor() -local ip4, netmask, ip6 +local ip4, ip6 if site.next_node.ip4 then - ip4 = site.next_node.ip4 - netmask = ip.IPv4(site.prefix4):mask():string() + local plen = site.prefix4:match('/%d+$') + ip4 = site.next_node.ip4 .. plen end if site.next_node.ip6 then @@ -25,7 +24,6 @@ uci:section('network', 'interface', 'client', proto = 'static', macaddr = site.next_node.mac, ipaddr = ip4, - netmask = netmask, ip6addr = ip6, } ) @@ -33,6 +31,7 @@ uci:section('network', 'interface', 'client', uci:delete('network', 'client', 'reqprefix') uci:delete('network', 'client', 'peerdns') uci:delete('network', 'client', 'sourcefilter') +uci:delete('network', 'client', 'netmask') local interfaces = uci:get('network', 'client', 'ifname') or {}