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 cd737c9..5245a92 100644 (file)
--- 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
        
        
        -- 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)
                
        

diff --git a/applications/luci-ffwizard-leipzig/luasrc/tools/ffwizard.lua b/applications/luci-ffwizard-leipzig/luasrc/tools/ffwizard.lua
index d679cc9..bb7cbb8 100644 (file)
--- 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 util = require "luci.util"
 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}
        cursor:foreach("network", "alias", 
                function(section)
        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
                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",
        
        -- Delete DHCP sections
        cursor:delete_all("dhcp", "dhcp",