From: Luka Perkov <luka@openwrt.org>
Date: Sun, 12 Oct 2014 07:44:08 +0000 (+0200)
Subject: lxc: set default lxcpath to /lxc
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=64a94896517be2d1e5e54a9b48bff13d11851e47;p=feed%2Fpackages.git

lxc: set default lxcpath to /lxc

Signed-off-by: Luka Perkov <luka@openwrt.org>
---

diff --git a/utils/lxc/Makefile b/utils/lxc/Makefile
index 0b684eb666..1a2bc6c2a8 100644
--- a/utils/lxc/Makefile
+++ b/utils/lxc/Makefile
@@ -155,7 +155,7 @@ define Package/lxc-common/install
 	$(INSTALL_DIR) $(1)/etc/lxc/
 	$(CP) \
 		$(PKG_INSTALL_DIR)/etc/lxc/default.conf \
-		$(1)/etc/lxc/
+		$(1)/etc/lxc/lxc.conf
 endef
 
 define Package/lxc-hooks/install
diff --git a/utils/lxc/patches/100-lxc-defconfig.patch b/utils/lxc/patches/100-lxc-defconfig.patch
new file mode 100644
index 0000000000..60a0f92606
--- /dev/null
+++ b/utils/lxc/patches/100-lxc-defconfig.patch
@@ -0,0 +1,5 @@
+--- a/config/etc/default.conf.unknown
++++ b/config/etc/default.conf.unknown
+@@ -1 +1,2 @@
++lxc.lxcpath = /lxc
+ lxc.network.type = empty