From: Steven Barth <steven@midlink.org>
Date: Fri, 5 Sep 2008 23:43:18 +0000 (+0000)
Subject: Fixed a few FF-Wizard issues
X-Git-Tag: 0.8.0~119
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=e6133d65e30775f91afdde32af54c47a54710c8c;p=project%2Fluci.git

Fixed a few FF-Wizard issues
---

diff --git a/applications/luci-ffwizard-leipzig/luasrc/model/cbi/ffwizard.lua b/applications/luci-ffwizard-leipzig/luasrc/model/cbi/ffwizard.lua
index cd737c9854..5245a92f15 100644
--- a/applications/luci-ffwizard-leipzig/luasrc/model/cbi/ffwizard.lua
+++ b/applications/luci-ffwizard-leipzig/luasrc/model/cbi/ffwizard.lua
@@ -141,8 +141,11 @@ function main.write(self, section, value)
 	
 	
 	-- Cleanup
+	luci.util.perror("1")
 	tools.wifi_delete_ifaces(device)
+	luci.util.perror("2")
 	tools.network_remove_interface(device)
+	luci.util.perror("3")
 	tools.firewall_zone_remove_interface("freifunk", device)
 		
 	
diff --git a/applications/luci-ffwizard-leipzig/luasrc/tools/ffwizard.lua b/applications/luci-ffwizard-leipzig/luasrc/tools/ffwizard.lua
index d679cc93ed..bb7cbb8345 100644
--- a/applications/luci-ffwizard-leipzig/luasrc/tools/ffwizard.lua
+++ b/applications/luci-ffwizard-leipzig/luasrc/tools/ffwizard.lua
@@ -18,6 +18,7 @@ local uci = require "luci.model.uci"
 local util = require "luci.util"
 local table = require "table"
 
+local type = type
 
 module "luci.tools.ffwizard"
 
@@ -39,11 +40,14 @@ function network_remove_interface(iface)
 	local aliases = {iface}
 	cursor:foreach("network", "alias", 
 		function(section)
-			table.insert(aliases, section[".name"])
+			if section.interface == iface then
+				table.insert(aliases, section[".name"])
+			end
 		end)
 	
 	-- 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
 	cursor:delete_all("dhcp", "dhcp",