[lxc-devel] [lxc-ci/master] lxc_ci: Fix support for LXC 3.0

[brauner on Github]

A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 365 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20180228/af82eee5/attachment.bin>
-------------- next part --------------
From ce3488d7517aa6fe1dea86e441259479d76e4683 Mon Sep 17 00:00:00 2001
From: Christian Brauner <christian.brauner at ubuntu.com>
Date: Wed, 28 Feb 2018 10:40:13 +0100
Subject: [PATCH] lxc_ci: Fix support for LXC 3.0

Signed-off-by: Christian Brauner <christian.brauner at ubuntu.com>
---
 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":