Fixed a few FF-Wizard issues
This commit is contained in:
parent
7f7a600b12
commit
e6133d65e3
2 changed files with 9 additions and 2 deletions
|
@ -141,8 +141,11 @@ function main.write(self, section, value)
|
||||||
|
|
||||||
|
|
||||||
-- Cleanup
|
-- Cleanup
|
||||||
|
luci.util.perror("1")
|
||||||
tools.wifi_delete_ifaces(device)
|
tools.wifi_delete_ifaces(device)
|
||||||
|
luci.util.perror("2")
|
||||||
tools.network_remove_interface(device)
|
tools.network_remove_interface(device)
|
||||||
|
luci.util.perror("3")
|
||||||
tools.firewall_zone_remove_interface("freifunk", device)
|
tools.firewall_zone_remove_interface("freifunk", device)
|
||||||
|
|
||||||
|
|
||||||
|
|
|
@ -18,6 +18,7 @@ local uci = require "luci.model.uci"
|
||||||
local util = require "luci.util"
|
local util = require "luci.util"
|
||||||
local table = require "table"
|
local table = require "table"
|
||||||
|
|
||||||
|
local type = type
|
||||||
|
|
||||||
module "luci.tools.ffwizard"
|
module "luci.tools.ffwizard"
|
||||||
|
|
||||||
|
@ -39,11 +40,14 @@ function network_remove_interface(iface)
|
||||||
local aliases = {iface}
|
local aliases = {iface}
|
||||||
cursor:foreach("network", "alias",
|
cursor:foreach("network", "alias",
|
||||||
function(section)
|
function(section)
|
||||||
table.insert(aliases, section[".name"])
|
if section.interface == iface then
|
||||||
|
table.insert(aliases, section[".name"])
|
||||||
|
end
|
||||||
end)
|
end)
|
||||||
|
|
||||||
-- Delete Aliases and Routes
|
-- Delete Aliases and Routes
|
||||||
cursor:delete_all("network", nil, {interface=iface})
|
cursor:delete_all("network", "route", {interface=iface})
|
||||||
|
cursor:delete_all("network", "alias", {interface=iface})
|
||||||
|
|
||||||
-- Delete DHCP sections
|
-- Delete DHCP sections
|
||||||
cursor:delete_all("dhcp", "dhcp",
|
cursor:delete_all("dhcp", "dhcp",
|
||||||
|
|
Loading…
Reference in a new issue