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

modules/admin-{mini,full}: start sysupgrade in background

Browse source
This commit is contained in:
Jo-Philipp Wich 2010-03-27 02:01:36 +00:00
parent 11527683bf
commit eaaaa39c17
2 changed files with 6 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
modules/admin-full/luasrc/controller/admin/system.lua
View file

@ -270,21 +270,15 @@ function action_upgrade()
if has_platform and has_image and has_support then if has_platform and has_image and has_support then
-- Mimetype text/plain -- Mimetype text/plain
luci.http.prepare_content("text/plain") luci.http.prepare_content("text/plain")
luci.http.write("Starting luci-flash...\n")
-- 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"
local fd = io.popen("/sbin/luci-flash %s %q" %{ local flash = ltn12_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 luci.ltn12.pump.all(flash, luci.http.write)
while true do
local ln = fd:read("*l")
if not ln then break end
luci.http.write(ln .. "\n")
end
fd:close()
end
-- Make sure the device is rebooted -- Make sure the device is rebooted
luci.sys.reboot() luci.sys.reboot()

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

@ -151,21 +151,15 @@ function action_upgrade()
if has_platform and has_image and has_support then if has_platform and has_image and has_support then
-- Mimetype text/plain -- Mimetype text/plain
luci.http.prepare_content("text/plain") luci.http.prepare_content("text/plain")
luci.http.write("Starting luci-flash...\n")
-- 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"
local fd = io.popen("/sbin/luci-flash %s %q" %{ local flash = ltn12_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 luci.ltn12.pump.all(flash, luci.http.write)
while true do
local ln = fd:read("*l")
if not ln then break end
luci.http.write(ln .. "\n")
end
fd:close()
end
-- Make sure the device is rebooted -- Make sure the device is rebooted
luci.sys.reboot() luci.sys.reboot()