From: Jo-Philipp Wich <jow@openwrt.org>
Date: Tue, 15 Dec 2015 21:56:47 +0000 (+0100)
Subject: Merge pull request #562 from cshore/pull-request-upload-dir
X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fluci.git;a=commitdiff_plain;h=19b85c34fcac8ad9b2829b4e034d7fefa42fb145;hp=ff2f536dd1473da59ae968e6294c6813d1093c58

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

modules/luci-base: Move LuCI FileUpload directory to /etc/luci-upload…
---

diff --git a/modules/luci-base/Makefile b/modules/luci-base/Makefile
index 26cbe0820..a9c5e71cb 100644
--- 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
diff --git a/modules/luci-base/luasrc/cbi.lua b/modules/luci-base/luasrc/cbi.lua
index b5b2c8d8f..8fd0a337e 100644
--- 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
 
diff --git a/modules/luci-base/root/etc/luci-uploads/.placeholder b/modules/luci-base/root/etc/luci-uploads/.placeholder
new file mode 100644
index 000000000..e69de29bb
diff --git a/modules/luci-base/root/lib/uci/upload/.placeholder b/modules/luci-base/root/lib/uci/upload/.placeholder
deleted file mode 100644
index e69de29bb..000000000