Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

modules/admin-full: use ubus call network reload after enabling, disabling or deleting wifi networks

Browse source
This commit is contained in:
Jo-Philipp Wich 2013-12-08 16:46:55 +00:00
parent 6f8881d48d
commit a654b40366
1 changed files with 2 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
modules/admin-full/luasrc/controller/admin/network.lua
View file

@ -231,7 +231,6 @@ function wifi_delete(network)
local dev = wnet:get_device() local dev = wnet:get_device()
local nets = wnet:get_networks() local nets = wnet:get_networks()
if dev then if dev then
luci.sys.call("env -i /sbin/wifi down %q >/dev/null" % dev:name())
ntm:del_wifinet(network) ntm:del_wifinet(network)
ntm:commit("wireless") ntm:commit("wireless")
local _, net local _, net
@ -241,7 +240,7 @@ function wifi_delete(network)
ntm:commit("network") ntm:commit("network")
end end
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 net = netmd:get_wifinet(wnet)
local dev = net:get_device() local dev = net:get_device()
if dev and net then if dev and net then
luci.sys.call("env -i /sbin/wifi down >/dev/null 2>/dev/null")
dev:set("disabled", nil) dev:set("disabled", nil)
net:set("disabled", shutdown and 1 or nil) net:set("disabled", shutdown and 1 or nil)
netmd:commit("wireless") 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") luci.http.status(200, shutdown and "Shutdown" or "Reconnected")
return return