From dfd4daf6333089e81cbbb6a49a169c8d93bee67d Mon Sep 17 00:00:00 2001 From: Luka Perkov Date: Mon, 17 Nov 2014 16:31:53 +0100 Subject: [PATCH] lxc: correctly install configuration files Signed-off-by: Luka Perkov --- utils/lxc/Makefile | 5 +++++ utils/lxc/files/lxc.conf | 1 + utils/lxc/patches/100-lxc-defconfig.patch | 5 ----- 3 files changed, 6 insertions(+), 5 deletions(-) create mode 100644 utils/lxc/files/lxc.conf delete mode 100644 utils/lxc/patches/100-lxc-defconfig.patch diff --git a/utils/lxc/Makefile b/utils/lxc/Makefile index 0156c94f3..3adfd5de9 100644 --- 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 index 000000000..3b77baa91 --- /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 index 60a0f9260..000000000 --- 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