commit dfd4daf6333089e81cbbb6a49a169c8d93bee67d parent e2994cfd93d96b14393470352adaa907357a5a92 Author: Luka Perkov <luka@openwrt.org> Date: Mon, 17 Nov 2014 16:31:53 +0100 lxc: correctly install configuration files Signed-off-by: Luka Perkov <luka@openwrt.org> Diffstat:
| M | utils/lxc/Makefile | | | 5 | +++++ |
| A | utils/lxc/files/lxc.conf | | | 1 | + |
| D | utils/lxc/patches/100-lxc-defconfig.patch | | | 5 | ----- |
3 files changed, 6 insertions(+), 5 deletions(-)
diff --git 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 @@ -0,0 +1 @@ +lxc.lxcpath = /lxc diff --git a/utils/lxc/patches/100-lxc-defconfig.patch b/utils/lxc/patches/100-lxc-defconfig.patch @@ -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