projects
/
project
/
luci.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
luci-base, luci-mod-admin-full: store backup vars in luci configuration
[project/luci.git]
/
modules
/
luci-base
/
luasrc
/
model
/
network.lua
diff --git
a/modules/luci-base/luasrc/model/network.lua
b/modules/luci-base/luasrc/model/network.lua
index
6f405a1
..
3521c6d
100644
(file)
--- a/
modules/luci-base/luasrc/model/network.lua
+++ b/
modules/luci-base/luasrc/model/network.lua
@@
-543,6
+543,9
@@
end
function del_network(self, n)
local r = _uci:delete("network", n)
if r then
function del_network(self, n)
local r = _uci:delete("network", n)
if r then
+ _uci:delete_all("luci", "ifstate",
+ function(s) return (s.interface == n) end)
+
_uci:delete_all("network", "alias",
function(s) return (s.interface == n) end)
_uci:delete_all("network", "alias",
function(s) return (s.interface == n) end)
@@
-998,7
+1001,12
@@
function protocol.ip6addrs(self)
if type(addrs) == "table" then
for n, addr in ipairs(addrs) do
if type(addrs) == "table" then
for n, addr in ipairs(addrs) do
- rv[#rv+1] = "%s1/%d" %{ addr.address, addr.mask }
+ if type(addr["local-address"]) == "table" then
+ rv[#rv+1] = "%s/%d" %{
+ addr["local-address"].address,
+ addr["local-address"].mask
+ }
+ end
end
end
end
end