Difuse/luci
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

modules/luci-base: Move LuCI FileUpload directory to /etc/luci-uploads and save across sysupgrade

Browse source 
/lib/uci/upload is a rather odd place for configuration files

Also the files were not saved across sysupgrade, which is somewhat
counter-productive for configuration files.

Signed-off By: Daniel Dickinson <openwrt@daniel.thecshore.com>
This commit is contained in:
Daniel Dickinson 2015-12-01 21:36:30 -05:00
parent 63155e9932
commit 403b939acd
3 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
modules/luci-base/Makefile
View file

@ -22,6 +22,10 @@ HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/LuaSrcDiet-0.12.1
include $(INCLUDE_DIR)/host-build.mk include $(INCLUDE_DIR)/host-build.mk
define Package/luci-base/conffiles
/etc/luci-uploads
endef
include ../../luci.mk include ../../luci.mk
define Host/Configure define Host/Configure

2
modules/luci-base/luasrc/cbi.lua
View file

@ -38,7 +38,7 @@ function load(cbimap, ...)
require("luci.config") require("luci.config")
require("luci.util") require("luci.util")
local upldir = "/lib/uci/upload/" local upldir = "/etc/luci-uploads/"
local cbidir = luci.util.libpath() .. "/model/cbi/" local cbidir = luci.util.libpath() .. "/model/cbi/"
local func, err local func, err

0
modules/luci-base/root/lib/uci/upload/.placeholder → modules/luci-base/root/etc/luci-uploads/.placeholder
View file