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

modules/admin-mini: merge r4865 to admin-mini

Browse source
This commit is contained in:
Jo-Philipp Wich 2009-06-17 12:48:18 +00:00
parent 901499b866
commit 2f9cbf7d05
1 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
modules/admin-mini/luasrc/controller/mini/system.lua
View file

@ -149,15 +149,21 @@ function action_upgrade()
-- previous pages should arrange the stuff as required. -- previous pages should arrange the stuff as required.
if step == 4 then if step == 4 then
if has_platform and has_image and has_support then if has_platform and has_image and has_support then
-- Next line is to bypass luci.http layer
luci.http.context.eoh = true
-- Now invoke sysupgrade -- Now invoke sysupgrade
local keepcfg = keep_avail and luci.http.formvalue("keepcfg") == "1" local keepcfg = keep_avail and luci.http.formvalue("keepcfg") == "1"
os.execute("/sbin/luci-flash %s %q" %{ local fd = io.popen("/sbin/luci-flash %s %q" %{
keepcfg and "-k %q" % _keep_pattern() or "", tmpfile keepcfg and "-k %q" % _keep_pattern() or "", tmpfile
}) })
if fd then
while true do
local ln = fd:read("*l")
if not ln then break end
luci.http.write(ln)
end
fd:close()
end
-- Make sure the device is rebooted -- Make sure the device is rebooted
luci.sys.reboot() luci.sys.reboot()
end end