From 97df663236cf9e881501d451e78a6b9208f57ee9 Mon Sep 17 00:00:00 2001 From: William Petit Date: Fri, 10 Feb 2017 09:23:10 +0100 Subject: [PATCH] =?UTF-8?q?Correction=20d=C3=A9tection=20pr=C3=A9sence=20d?= =?UTF-8?q?e=20systemd?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- package | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/package b/package index ff5df1b..72472e1 100755 --- a/package +++ b/package @@ -102,7 +102,8 @@ if __name__ == "__main__": cb_hooks_env = os.environ.copy() cb_hooks_env["PATH"] = os.environ['PATH'] + ':' + local_acbuild_dir cb_hooks_env["TAMARIN_ACBUILD"] = " ".join([system.which('acbuild', local_acbuild_dir)]+acbuild_flags) - cb_hooks_env["TAMARIN_ACBUILD_ENGINE"] = "chroot" if system.which('systemd-nspawn') == "" else "systemd-nspawn" + cb_hooks_env["TAMARIN_ACBUILD_ENGINE"] = "chroot" if not system.which('systemctl') else "systemd-nspawn" + tamarin.run_profile_hooks(profile, 'containerbuild', cwd=build_workspace, env=cb_hooks_env) # Cache image