Redesigned firmware upgrade process

[project/luci.git] / modules / admin-full / luasrc / controller / admin / system.lua

diff --git a/modules/admin-full/luasrc/controller/admin/system.lua b/modules/admin-full/luasrc/controller/admin/system.lua
index 4303d86..55087a0 100644 (file)
--- a/modules/admin-full/luasrc/controller/admin/system.lua
+++ b/modules/admin-full/luasrc/controller/admin/system.lua
@@ -17,12 +17,13 @@ function index()
        luci.i18n.loadc("admin-core")
        local i18n = luci.i18n.translate
        
-       entry({"admin", "system"}, template("admin_system/index"), i18n("system"), 30)
+       entry({"admin", "system"}, alias("admin", "system", "system"), i18n("system"), 30)
+       entry({"admin", "system", "system"}, cbi("admin_system/system"), i18n("system"), 1)
        entry({"admin", "system", "packages"}, call("action_packages"), i18n("a_s_packages"), 10)
        entry({"admin", "system", "packages", "ipkg"}, form("admin_system/ipkg"), i18n("a_s_p_ipkg"))
        entry({"admin", "system", "passwd"}, form("admin_system/passwd"), i18n("a_s_changepw"), 20)
        entry({"admin", "system", "sshkeys"}, form("admin_system/sshkeys"), i18n("a_s_sshkeys"), 30)
-       entry({"admin", "system", "system"}, cbi("admin_system/system"), i18n("system"), 40)
+       entry({"admin", "system", "processes"}, form("admin_system/processes"), i18n("process_head"), 45)
        entry({"admin", "system", "fstab"}, cbi("admin_system/fstab"), i18n("a_s_fstab"), 50)
        entry({"admin", "system", "leds"}, cbi("admin_system/leds"), i18n("leds", "LEDs"), 60)
        entry({"admin", "system", "backup"}, call("action_backup"), i18n("a_s_backup"), 70)
@@ -85,7 +86,7 @@ function action_packages()
        
        
        -- Package info
-       local info = luci.model.ipkg.info(query)
+       local info = luci.model.ipkg.info(query and "*"..query.."*")
        info = info or {}
        local pkgs = {}
        
@@ -181,7 +182,7 @@ end
 function action_upgrade()
        require("luci.model.uci")
 
-       local ret  = nil
+       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
@@ -207,15 +208,16 @@ 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, 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()
        local kpattern = ""
-       local files = luci.model.uci.get_all("luci", "flash_keep")
+       local files = luci.model.uci.cursor():get_all("luci", "flash_keep")
        if files then
                kpattern = ""
                for k,v in pairs(files) do
@@ -223,4 +225,4 @@ function _keep_pattern()
                end
        end
        return kpattern
-end
\ No newline at end of file
+end