diff options
Diffstat (limited to 'modules/admin-full/luasrc/controller/admin/system.lua')
| -rw-r--r-- | modules/admin-full/luasrc/controller/admin/system.lua | 9 |
1 files changed, 4 insertions, 5 deletions
diff --git a/modules/admin-full/luasrc/controller/admin/system.lua b/modules/admin-full/luasrc/controller/admin/system.lua index 5d64336e0..55087a017 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 + local ret, err 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,12 +208,11 @@ function action_upgrade() local keepcfg = keep_avail and luci.http.formvalue("keepcfg") if plat and fname then - ret = function() - return luci.sys.flash(tmpfile, keepcfg and _keep_pattern()) - end + ret, err = luci.sys.flash(tmpfile, keepcfg and _keep_pattern()) end - luci.template.render("admin_system/upgrade", {sysupgrade=plat, ret=ret, keep_avail=keep_avail}) + luci.template.render("admin_system/upgrade", {sysupgrade=plat, + ret=ret, err=err, keep_avail=keep_avail}) end function _keep_pattern() |