Cadoles
/
Tamarin
21
0
Fork 0
Code Issues 1 Pull Requests 1 Releases Wiki Activity

Correction détection présence de systemd

This commit is contained in:
wpetit 2017-02-10 09:23:10 +01:00
parent 15643cf145
commit 97df663236
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
package
View File

@ -102,7 +102,8 @@ if __name__ == "__main__":
cb_hooks_env = os.environ.copy() cb_hooks_env = os.environ.copy()
cb_hooks_env["PATH"] = os.environ['PATH'] + ':' + local_acbuild_dir 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"] = " ".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) tamarin.run_profile_hooks(profile, 'containerbuild', cwd=build_workspace, env=cb_hooks_env)
# Cache image # Cache image