projects
/
project
/
luci.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
2d3f2a9
)
admin-full/admin-mini: Fixed backup module
author
Steven Barth
<steven@midlink.org>
Fri, 19 Sep 2008 17:47:56 +0000
(17:47 +0000)
committer
Steven Barth
<steven@midlink.org>
Fri, 19 Sep 2008 17:47:56 +0000
(17:47 +0000)
libs/web/root/etc/config/luci
patch
|
blob
|
history
modules/admin-full/luasrc/controller/admin/system.lua
patch
|
blob
|
history
modules/admin-mini/luasrc/controller/mini/system.lua
patch
|
blob
|
history
diff --git
a/libs/web/root/etc/config/luci
b/libs/web/root/etc/config/luci
index
4e31f9d
..
54363e0
100644
(file)
--- a/
libs/web/root/etc/config/luci
+++ b/
libs/web/root/etc/config/luci
@@
-10,12
+10,11
@@
config core brand
option distro "Development Snapshot"
config extern flash_keep
option distro "Development Snapshot"
config extern flash_keep
- option uci
"/etc/config
"
- option dropbear "/etc/dropbear"
- option openvpn "/etc/openvpn"
+ option uci
"/etc/config/
"
+ option dropbear "/etc/dropbear
/
"
+ option openvpn "/etc/openvpn
/
"
option passwd "/etc/passwd"
option passwd "/etc/passwd"
- option ipkg "/etc/ipkg.conf"
- option httpd "/etc/httpd.conf"
+ option opkg "/etc/opkg.conf"
option firewall "/etc/firewall.user"
config internal languages
option firewall "/etc/firewall.user"
config internal languages
diff --git
a/modules/admin-full/luasrc/controller/admin/system.lua
b/modules/admin-full/luasrc/controller/admin/system.lua
index
c89c585
..
ba592da
100644
(file)
--- a/
modules/admin-full/luasrc/controller/admin/system.lua
+++ b/
modules/admin-full/luasrc/controller/admin/system.lua
@@
-222,8
+222,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
diff --git
a/modules/admin-mini/luasrc/controller/mini/system.lua
b/modules/admin-mini/luasrc/controller/mini/system.lua
index
8b711d5
..
3a5f12c
100644
(file)
--- a/
modules/admin-mini/luasrc/controller/mini/system.lua
+++ b/
modules/admin-mini/luasrc/controller/mini/system.lua
@@
-119,9
+119,11
@@
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
-end
+end
\ No newline at end of file