Developing lightweight computation at the DSG edge

Commit 4ba0e516 authored by Roger Pueyo Centelles's avatar Roger Pueyo Centelles
Browse files

Merge branch 'master' into testing


Signed-off-by: default avatarRoger Pueyo Centelles <roger.pueyo@guifi.net>
parents 7a906a35 630bd7a8
......@@ -51,7 +51,7 @@ apply_services() {
configure_network() {
qmp_configure
qmp_bmx6_reload
/etc/init.d/network reload
/etc/init.d/network restart
if /etc/init.d/gwck enabled
then
/etc/init.d/gwck restart
......
......@@ -850,7 +850,7 @@ qmp_configure_initial() {
qmp_hooks_exec firstboot
qmp_configure_wifi_initial
qmp_configure_wifi
/etc/init.d/network reload
/etc/init.d/network restart
sleep 1
qmp_configure_smart_network
}
......
......@@ -68,8 +68,12 @@ function qmpinfo.get_devices()
local ignore = isInTable(ignored,d)
if not ignore then
local do_insert = false
if nixio.fs.stat(sysnet..d..'/phy80211',"type") ~= nil then
table.insert(phydevs.wifi,d)
if string.sub(d, -1) ~= "a" then
table.insert(phydevs.wifi,d)
do_insert = true
end
else
local toadd = true
......@@ -83,10 +87,13 @@ function qmpinfo.get_devices()
if toadd == true then
table.insert(phydevs.eth,d)
do_insert = true
end
end
table.insert(phydevs.all,d)
if do_insert then
table.insert(phydevs.all,d)
end
end
end
end
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment