Broadcom should handle keep_avail now

[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 0df4f8c..ac6d64b 100644 (file)
--- a/modules/admin-mini/luasrc/controller/mini/system.lua
+++ b/modules/admin-mini/luasrc/controller/mini/system.lua
@@ -21,7 +21,7 @@ function index()
 
        entry({"mini", "system"}, alias("mini", "system", "index"), i18n("system"), 40)
        entry({"mini", "system", "index"}, cbi("mini/system"), i18n("general"), 1)
-       entry({"mini", "system", "passwd"}, call("action_passwd"), i18n("a_s_changepw"), 10)
+       entry({"mini", "system", "passwd"}, form("mini/passwd"), i18n("a_s_changepw"), 10)
        entry({"mini", "system", "backup"}, call("action_backup"), i18n("a_s_backup"), 80)
        entry({"mini", "system", "upgrade"}, call("action_upgrade"), i18n("a_s_flash"), 90)
        entry({"mini", "system", "reboot"}, call("action_reboot"), i18n("reboot"), 100)
@@ -81,10 +81,8 @@ function action_upgrade()
 
        local ret  = nil
        local plat = luci.fs.mtime("/lib/upgrade/platform.sh")
-       local broadcom = os.execute('grep brcm_ /lib/upgrade/platform.sh >/dev/null 2>&1') == 0
        local tmpfile = "/tmp/firmware.img"
-       
-       local keep_avail = not broadcom
+       local keep_avail = true
 
        local file
        luci.http.setfilehandler(
@@ -105,35 +103,24 @@ 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())
-       end
-
-       luci.template.render("mini/upgrade", {sysupgrade=plat, ret=ret, keep_avail=keep_avail})
-end
-
-function action_passwd()
-       local p1 = luci.http.formvalue("pwd1")
-       local p2 = luci.http.formvalue("pwd2")
-       local stat = nil
-
-       if p1 or p2 then
-               if p1 == p2 then
-                       stat = luci.sys.user.setpasswd("root", p1)
-               else
-                       stat = 10
+               ret = function()
+                       return luci.sys.flash(tmpfile, keepcfg and _keep_pattern())
                end
        end
 
-       luci.template.render("mini/passwd", {stat=stat})
+       luci.http.prepare_content("text/html")
+       luci.template.render("mini/upgrade", {sysupgrade=plat, ret=ret, 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
-                       kpattern = kpattern .. " " ..  v
+               for k, v in pairs(files) do
+                       if k:sub(1,1) ~= "." and luci.fs.glob(v) then
+                               kpattern = kpattern .. " " ..  v
+                       end
                end
        end
        return kpattern