From 2bbc4eb3c33c3590433174c599ec9418bdb8f38a Mon Sep 17 00:00:00 2001 From: Steven Barth Date: Fri, 12 Sep 2008 16:12:23 +0000 Subject: Revert "Redesigned firmware upgrade process" --- modules/admin-full/luasrc/controller/admin/system.lua | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) (limited to 'modules/admin-full/luasrc/controller') diff --git a/modules/admin-full/luasrc/controller/admin/system.lua b/modules/admin-full/luasrc/controller/admin/system.lua index 55087a0177..5d64336e03 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, err + 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,11 +208,12 @@ function action_upgrade() local keepcfg = keep_avail and luci.http.formvalue("keepcfg") if plat and fname then - ret, err = 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, err=err, keep_avail=keep_avail}) + luci.template.render("admin_system/upgrade", {sysupgrade=plat, ret=ret, keep_avail=keep_avail}) end function _keep_pattern() -- cgit v1.2.3