diff options
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/admin-full/luasrc/controller/admin/system.lua | 6 | ||||
| -rw-r--r-- | modules/admin-full/luasrc/view/admin_system/upgrade.htm | 5 |
2 files changed, 8 insertions, 3 deletions
diff --git a/modules/admin-full/luasrc/controller/admin/system.lua b/modules/admin-full/luasrc/controller/admin/system.lua index 6cf951a15..bbe202d9d 100644 --- a/modules/admin-full/luasrc/controller/admin/system.lua +++ b/modules/admin-full/luasrc/controller/admin/system.lua @@ -182,7 +182,7 @@ end function action_upgrade() require("luci.model.uci") - local ret = nil + local ret local plat = luci.fs.mtime("/lib/upgrade/platform.sh") local tmpfile = "/tmp/firmware.img" local broadcom = os.execute('grep brcm_ /lib/upgrade/platform.sh >/dev/null 2>&1') == 0 @@ -208,7 +208,9 @@ function action_upgrade() 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("admin_system/upgrade", {sysupgrade=plat, ret=ret, keep_avail=keep_avail}) diff --git a/modules/admin-full/luasrc/view/admin_system/upgrade.htm b/modules/admin-full/luasrc/view/admin_system/upgrade.htm index e0fbb9332..03cd555c7 100644 --- a/modules/admin-full/luasrc/view/admin_system/upgrade.htm +++ b/modules/admin-full/luasrc/view/admin_system/upgrade.htm @@ -34,7 +34,10 @@ $Id$ </div> </form> <% elseif ret then %> - <% if ret == 0 then %> + <p><%:a_s_flash_received%></p> + <p><%:a_s_flash_inprogress%></p> + <% local ret = ret() + if ret == 0 then %> <div class="ok"><%:a_s_flash_flashed%></div> <% else %> <div class="error"><%:a_s_flash_flasherr%>! (<%:code%> <%=ret%>)</div> |