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

luci-0.9: merge r4865 and r4866

Browse source
This commit is contained in:
Jo-Philipp Wich 2009-06-17 12:49:16 +00:00
parent 75da8f7de3
commit cd1442893a
2 changed files with 20 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -266,15 +266,21 @@ function action_upgrade()
-- previous pages should arrange the stuff as required.
if step == 4 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
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
})
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
luci.sys.reboot()
end

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.
if step == 4 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
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
})
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
luci.sys.reboot()
end