lxc: correctly install configuration files

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

diff --git a/utils/lxc/Makefile b/utils/lxc/Makefile
index 0156c94f315358eaf93674289cd6d4cf24dd4d77..3adfd5de952e6aea6caaf4a460fadfb31b202e4e 100644 (file)
--- a/utils/lxc/Makefile
+++ b/utils/lxc/Makefile
@@ -165,6 +165,11 @@ define Package/lxc-common/install
        $(INSTALL_DIR) $(1)/etc/lxc/
        $(CP) \
                $(PKG_INSTALL_DIR)/etc/lxc/default.conf \
+               $(1)/etc/lxc/default.conf
+
+       $(INSTALL_DIR) $(1)/etc/lxc/
+       $(CP) \
+               ./files/lxc.conf \
                $(1)/etc/lxc/lxc.conf
 
        $(INSTALL_DIR) $(1)/lxc/

diff --git a/utils/lxc/files/lxc.conf b/utils/lxc/files/lxc.conf
new file mode 100644 (file)
index 0000000..3b77baa
--- /dev/null
+++ b/utils/lxc/files/lxc.conf
@@ -0,0 +1 @@
+lxc.lxcpath = /lxc

diff --git a/utils/lxc/patches/100-lxc-defconfig.patch b/utils/lxc/patches/100-lxc-defconfig.patch
deleted file mode 100644 (file)
index 60a0f92..0000000
--- a/utils/lxc/patches/100-lxc-defconfig.patch
+++ /dev/null
@@ -1,5 +0,0 @@
---- a/config/etc/default.conf.unknown
-+++ b/config/etc/default.conf.unknown
-@@ -1 +1,2 @@
-+lxc.lxcpath = /lxc
- lxc.network.type = empty