diff options
| author | Jo-Philipp Wich <jow@openwrt.org> | 2015-12-15 22:56:47 +0100 |
|---|---|---|
| committer | Jo-Philipp Wich <jow@openwrt.org> | 2015-12-15 22:56:47 +0100 |
| commit | 19b85c34fcac8ad9b2829b4e034d7fefa42fb145 (patch) | |
| tree | f9d86ba47561c3d8f86be0507602132b92497496 | |
| parent | ff2f536dd1473da59ae968e6294c6813d1093c58 (diff) | |
| parent | 403b939acd55be528fa78bfc11521c78b1afdad8 (diff) | |
Merge pull request #562 from cshore/pull-request-upload-dir
modules/luci-base: Move LuCI FileUpload directory to /etc/luci-upload…
| -rw-r--r-- | modules/luci-base/Makefile | 4 | ||||
| -rw-r--r-- | modules/luci-base/luasrc/cbi.lua | 2 | ||||
| -rw-r--r-- | modules/luci-base/root/etc/luci-uploads/.placeholder (renamed from modules/luci-base/root/lib/uci/upload/.placeholder) | 0 |
3 files changed, 5 insertions, 1 deletions
diff --git a/modules/luci-base/Makefile b/modules/luci-base/Makefile index 26cbe0820e..a9c5e71cba 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 b5b2c8d8f2..8fd0a337e2 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/lib/uci/upload/.placeholder b/modules/luci-base/root/etc/luci-uploads/.placeholder index e69de29bb2..e69de29bb2 100644 --- a/modules/luci-base/root/lib/uci/upload/.placeholder +++ b/modules/luci-base/root/etc/luci-uploads/.placeholder |