lxc: Use more FSH compliant /srv/lxc instead of new root dir

Normally LXC uses /var/lib, but due to hack OpenWRT employs this is not an
option. But instead of introducing new top-level directory, FSH compatible /srv
can be used.

Signed-off-by: Michal Hrusecky <redacted>

diff --git a/utils/lxc/Makefile b/utils/lxc/Makefile
index a6935e03c1d764894481246c3cab42bed9ffe555..0df1460fe31c26d74d27b0cd748d9168c4892f1e 100644 (file)
--- a/utils/lxc/Makefile
+++ b/utils/lxc/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=lxc
 PKG_VERSION:=1.1.5
-PKG_RELEASE:=2
+PKG_RELEASE:=3
 
 PKG_LICENSE:=LGPL-2.1+ BSD-2-Clause GPL-2.0
 PKG_MAINTAINER:=Luka Perkov <luka@openwrt.org>
@@ -199,7 +199,7 @@ define Package/lxc-common/install
                ./files/lxc.conf \
                $(1)/etc/lxc/lxc.conf
 
-       $(INSTALL_DIR) $(1)/lxc/
+       $(INSTALL_DIR) $(1)/srv/lxc/
 endef
 
 define Package/lxc-hooks/install

diff --git a/utils/lxc/files/lxc.conf b/utils/lxc/files/lxc.conf
index 3b77baa915424118e1d3c2f0791c3e70c5606e86..77841cc25a8d236e2e449fb1dc8a96b010443ebc 100644 (file)
--- a/utils/lxc/files/lxc.conf
+++ b/utils/lxc/files/lxc.conf
@@ -1 +1 @@
-lxc.lxcpath = /lxc
+lxc.lxcpath = /srv/lxc