The following pull request was submitted through Github. It can be accessed and reviewed at: https://github.com/lxc/lxc-ci/pull/21
This e-mail was sent by the LXC bot, direct replies will not reach the author unless they happen to be subscribed to this list. === Description (from pull-request) === Signed-off-by: Christian Brauner <[email protected]>
From ce3488d7517aa6fe1dea86e441259479d76e4683 Mon Sep 17 00:00:00 2001 From: Christian Brauner <[email protected]> Date: Wed, 28 Feb 2018 10:40:13 +0100 Subject: [PATCH] lxc_ci: Fix support for LXC 3.0 Signed-off-by: Christian Brauner <[email protected]> --- lxc_ci/__init__.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/lxc_ci/__init__.py b/lxc_ci/__init__.py index 7745cd4..f7451ee 100644 --- a/lxc_ci/__init__.py +++ b/lxc_ci/__init__.py @@ -455,8 +455,8 @@ def generate_image_metadata(template, arch, config, target): tarball.addfile(config_system_file, BytesIO(content.encode('utf-8'))) # config-user.5 - content = "lxc.include = LXC_TEMPLATE_CONFIG/common.conf" - content += "lxc.include = LXC_TEMPLATE_CONFIG/userns.conf" + content = "lxc.include = LXC_TEMPLATE_CONFIG/common.conf\n" + content += "lxc.include = LXC_TEMPLATE_CONFIG/userns.conf\n" if arch == "amd64": content += "lxc.arch = x86_64\n" elif arch == "i386": @@ -468,7 +468,7 @@ def generate_image_metadata(template, arch, config, target): tarball.addfile(config_user_file, BytesIO(content.encode('utf-8'))) # config.5 - content = "lxc.include = LXC_TEMPLATE_CONFIG/common.conf" + content = "lxc.include = LXC_TEMPLATE_CONFIG/common.conf\n" if arch == "amd64": content += "lxc.arch = x86_64\n" elif arch == "i386":
_______________________________________________ lxc-devel mailing list [email protected] http://lists.linuxcontainers.org/listinfo/lxc-devel
