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

luci-0.9: merge r4868

Browse source
This commit is contained in:
Jo-Philipp Wich 2009-06-17 12:57:34 +00:00
parent cd1442893a
commit 86306c4324
2 changed files with 6 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -266,6 +266,9 @@ 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
-- Mimetype text/plain
luci.http.prepare_content("text/plain")
-- 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 fd = io.popen("/sbin/luci-flash %s %q" %{

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

@ -149,6 +149,9 @@ 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
-- Mimetype text/plain
luci.http.prepare_content("text/plain")
-- 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 fd = io.popen("/sbin/luci-flash %s %q" %{