1
0
mirror of https://github.com/freifunk-gluon/packages.git synced 2024-06-26 09:37:32 +02:00

Merge pull request #12 from freifunk-gluon/configmode-reboot

gluon-config-mode: delay reboot a little
This commit is contained in:
Nils Schneider 2014-01-22 15:16:43 -08:00
commit f56d6a5d17

View File

@ -51,7 +51,6 @@ function action_reboot()
if meshvpn_enabled == "1" then
pubkey = configmode.get_fastd_pubkey(meshvpn_name)
end
luci.template.render("gluon-config-mode/reboot", {pubkey=pubkey})
uci:foreach("gluon-config-mode", "wizard", function(s)
uci:set("gluon-config-mode", s[".name"], "configured", "1")
@ -59,5 +58,20 @@ function action_reboot()
uci:save("gluon-config-mode")
uci:commit("gluon-config-mode")
luci.sys.reboot()
if nixio.fork() ~= 0 then
luci.template.render("gluon-config-mode/reboot", {pubkey=pubkey})
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
-- display the reboot page, then reboot the device.
nixio.nanosleep(2)
-- Run reboot with popen so it gets its own std filehandles.
io.popen("reboot")
-- Prevent any further execution in this child.
os.exit()
end
end