Merge pull request #562 from cshore/pull-request-upload-dir

modules/luci-base: Move LuCI FileUpload directory to /etc/luci-upload…
2015-12-15 22:56:47 +01:00 · 2015-12-15 22:56:47 +01:00 · 19b85c34fc
commit 19b85c34fc
parent ff2f536dd1 403b939acd
3 changed files with 5 additions and 1 deletions
--- a/modules/luci-base/Makefile
+++ b/modules/luci-base/Makefile
@ -22,6 +22,10 @@ HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/LuaSrcDiet-0.12.1

 include $(INCLUDE_DIR)/host-build.mk

+define Package/luci-base/conffiles
+/etc/luci-uploads
+endef
+
 include ../../luci.mk

 define Host/Configure
--- a/modules/luci-base/luasrc/cbi.lua
+++ b/modules/luci-base/luasrc/cbi.lua
@ -38,7 +38,7 @@ function load(cbimap, ...)
 	require("luci.config")
 	require("luci.util")

-	local upldir = "/lib/uci/upload/"
+	local upldir = "/etc/luci-uploads/"
 	local cbidir = luci.util.libpath() .. "/model/cbi/"
 	local func, err

--- a/modules/luci-base/root/etc/luci-uploads/.placeholder
+++ b/modules/luci-base/root/etc/luci-uploads/.placeholder