Skip to content
Snippets Groups Projects
Unverified Commit 97879e80 authored by Matthias Schiffer's avatar Matthias Schiffer
Browse files

gluon-config-mode-core: clean up reboot handling

Don't fork reboot process before all package hooks have been handled and
rendering is complete.

Replace debug.setfenv hack to close stdout with nixio.dup.

Fixes #772
parent 4a60e5a0
No related branches found
No related tags found
No related merge requests found
...@@ -48,43 +48,42 @@ function action_reboot() ...@@ -48,43 +48,42 @@ function action_reboot()
uci:save("gluon-setup-mode") uci:save("gluon-setup-mode")
uci:commit("gluon-setup-mode") uci:commit("gluon-setup-mode")
if nixio.fork() ~= 0 then local fs = require "nixio.fs"
local fs = require "nixio.fs" local util = require "nixio.util"
local util = require "nixio.util"
local parts_dir = "/lib/gluon/config-mode/reboot/" local parts_dir = "/lib/gluon/config-mode/reboot/"
local files = util.consume(fs.dir(parts_dir)) local files = util.consume(fs.dir(parts_dir))
table.sort(files) table.sort(files)
local parts = {} local parts = {}
for _, entry in ipairs(files) do for _, entry in ipairs(files) do
if entry:sub(1, 1) ~= '.' then if entry:sub(1, 1) ~= '.' then
local f = dofile(parts_dir .. '/' .. entry) local f = dofile(parts_dir .. '/' .. entry)
if f ~= nil then if f ~= nil then
table.insert(parts, f) table.insert(parts, f)
end
end end
end end
end
local hostname = uci:get_first("system", "system", "hostname")
local hostname = uci:get_first("system", "system", "hostname") luci.template.render("gluon/config-mode/reboot",
{
parts = parts,
hostname = hostname,
}
)
luci.template.render("gluon/config-mode/reboot", { parts=parts if nixio.fork() == 0 then
, hostname=hostname -- Replace stdout with /dev/null
}) nixio.dup(nixio.open('/dev/null', 'w'), nixio.stdout)
else
debug.setfenv(io.stdout, debug.getfenv(io.open '/dev/null'))
io.stdout:close()
-- Sleep a little so the browser can fetch everything required to -- Sleep a little so the browser can fetch everything required to
-- display the reboot page, then reboot the device. -- display the reboot page, then reboot the device.
nixio.nanosleep(2) nixio.nanosleep(1)
-- Run reboot with popen so it gets its own std filehandles.
io.popen("reboot")
-- Prevent any further execution in this child. nixio.execp("reboot")
os.exit()
end end
end end
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment