modules/admin-full: use ubus call network reload after enabling, disabling or deletin...
authorJo-Philipp Wich <jow@openwrt.org>
Sun, 8 Dec 2013 16:46:55 +0000 (16:46 +0000)
committerJo-Philipp Wich <jow@openwrt.org>
Sun, 8 Dec 2013 16:46:55 +0000 (16:46 +0000)
modules/admin-full/luasrc/controller/admin/network.lua

index 54afa1b..98f4395 100644 (file)
@@ -231,7 +231,6 @@ function wifi_delete(network)
                local dev = wnet:get_device()
                local nets = wnet:get_networks()
                if dev then
                local dev = wnet:get_device()
                local nets = wnet:get_networks()
                if dev then
-                       luci.sys.call("env -i /sbin/wifi down %q >/dev/null" % dev:name())
                        ntm:del_wifinet(network)
                        ntm:commit("wireless")
                        local _, net
                        ntm:del_wifinet(network)
                        ntm:commit("wireless")
                        local _, net
@@ -241,7 +240,7 @@ function wifi_delete(network)
                                        ntm:commit("network")
                                end
                        end
                                        ntm:commit("network")
                                end
                        end
-                       luci.sys.call("env -i /sbin/wifi up %q >/dev/null" % dev:name())
+                       luci.sys.call("env -i /bin/ubus call network reload >/dev/null 2>/dev/null")
                end
        end
 
                end
        end
 
@@ -391,13 +390,11 @@ local function wifi_reconnect_shutdown(shutdown, wnet)
        local net = netmd:get_wifinet(wnet)
        local dev = net:get_device()
        if dev and net then
        local net = netmd:get_wifinet(wnet)
        local dev = net:get_device()
        if dev and net then
-               luci.sys.call("env -i /sbin/wifi down >/dev/null 2>/dev/null")
-
                dev:set("disabled", nil)
                net:set("disabled", shutdown and 1 or nil)
                netmd:commit("wireless")
 
                dev:set("disabled", nil)
                net:set("disabled", shutdown and 1 or nil)
                netmd:commit("wireless")
 
-               luci.sys.call("env -i /sbin/wifi up >/dev/null 2>/dev/null")
+               luci.sys.call("env -i /bin/ubus call network reload >/dev/null 2>/dev/null")
                luci.http.status(200, shutdown and "Shutdown" or "Reconnected")
 
                return
                luci.http.status(200, shutdown and "Shutdown" or "Reconnected")
 
                return