X-Git-Url: http://git.openwrt.org/?a=blobdiff_plain;f=modules%2Fadmin-mini%2Fluasrc%2Fcontroller%2Fmini%2Fsystem.lua;h=9d0ef0c639a039d14cba96cadc3c8b470a915900;hb=8815b6a7dd24a481606db03c5980bc310709a103;hp=265443bd32025a320ab63c4f83c9e760b025d900;hpb=7514604860540ad30bbe82aabc6692f89f301b92;p=project%2Fluci.git

diff --git a/modules/admin-mini/luasrc/controller/mini/system.lua b/modules/admin-mini/luasrc/controller/mini/system.lua
index 265443bd32..9d0ef0c639 100644
--- a/modules/admin-mini/luasrc/controller/mini/system.lua
+++ b/modules/admin-mini/luasrc/controller/mini/system.lua
@@ -19,7 +19,7 @@ function index()
 	luci.i18n.loadc("admin-core")
 	local i18n = luci.i18n.translate
 
-	entry({"mini", "system"}, alias("mini", "system", "index"), i18n("system"), 40)
+	entry({"mini", "system"}, alias("mini", "system", "index"), i18n("system"), 40).index = true
 	entry({"mini", "system", "index"}, cbi("mini/system"), i18n("general"), 1)
 	entry({"mini", "system", "passwd"}, form("mini/passwd"), i18n("a_s_changepw"), 10)
 	entry({"mini", "system", "backup"}, call("action_backup"), i18n("a_s_backup"), 80)
@@ -82,9 +82,7 @@ function action_upgrade()
 	local ret  = nil
 	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
-	 
-	local keep_avail = not broadcom
+	local keep_avail = true
 
 	local file
 	luci.http.setfilehandler(
@@ -110,6 +108,7 @@ function action_upgrade()
 		end
 	end
 
+	luci.http.prepare_content("text/html")
 	luci.template.render("mini/upgrade", {sysupgrade=plat, ret=ret, keep_avail=keep_avail})
 end
 
@@ -118,8 +117,10 @@ function _keep_pattern()
 	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