projects
/
project
/
luci.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Broadcom should handle keep_avail now
[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
5d64336
..
5d60371
100644
(file)
--- a/
modules/admin-full/luasrc/controller/admin/system.lua
+++ b/
modules/admin-full/luasrc/controller/admin/system.lua
@@
-185,9
+185,7
@@
function action_upgrade()
local ret
local plat = luci.fs.mtime("/lib/upgrade/platform.sh")
local tmpfile = "/tmp/firmware.img"
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
-
- local keep_avail = not broadcom
+ local keep_avail = true
local file
luci.http.setfilehandler(
local file
luci.http.setfilehandler(
@@
-213,6
+211,7
@@
function action_upgrade()
end
end
end
end
+ luci.http.prepare_content("text/html")
luci.template.render("admin_system/upgrade", {sysupgrade=plat, ret=ret, keep_avail=keep_avail})
end
luci.template.render("admin_system/upgrade", {sysupgrade=plat, ret=ret, keep_avail=keep_avail})
end
@@
-221,8
+220,10
@@
function _keep_pattern()
local files = luci.model.uci.cursor():get_all("luci", "flash_keep")
if files then
kpattern = ""
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
end
end
return kpattern