projects
/
project
/
luci.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "Redesigned firmware upgrade process"
[project/luci.git]
/
modules
/
admin-mini
/
luasrc
/
controller
/
mini
/
system.lua
diff --git
a/modules/admin-mini/luasrc/controller/mini/system.lua
b/modules/admin-mini/luasrc/controller/mini/system.lua
index
c3910a3
..
6d16ef8
100644
(file)
--- a/
modules/admin-mini/luasrc/controller/mini/system.lua
+++ b/
modules/admin-mini/luasrc/controller/mini/system.lua
@@
-105,7
+105,9
@@
function action_upgrade()
local keepcfg = keep_avail and luci.http.formvalue("keepcfg")
if plat and fname then
local keepcfg = keep_avail and luci.http.formvalue("keepcfg")
if plat and fname then
- ret = luci.sys.flash(tmpfile, keepcfg and _keep_pattern())
+ ret = function()
+ return luci.sys.flash(tmpfile, keepcfg and _keep_pattern())
+ end
end
luci.template.render("mini/upgrade", {sysupgrade=plat, ret=ret, keep_avail=keep_avail})
end
luci.template.render("mini/upgrade", {sysupgrade=plat, ret=ret, keep_avail=keep_avail})
@@
-121,4
+123,4
@@
function _keep_pattern()
end
end
return kpattern
end
end
return kpattern
-end
\ No newline at end of file
+end