almalinux/lorax
13
0
Fork 0
Code Issues Pull Requests Releases Activity

Set lorax_templates to the correct directory

Browse Source 
Templates are under the share dir, so use find_templates() to find them.
This commit is contained in:
Brian C. Lane 2018-05-10 08:51:53 -07:00
parent d6283f9540
commit bb652368dc
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/pylorax/api/queue.py
View File

@ -28,6 +28,7 @@ import subprocess
from subprocess import Popen, PIPE from subprocess import Popen, PIPE
import time import time
from pylorax import find_templates
from pylorax.api.compose import move_compose_results from pylorax.api.compose import move_compose_results
from pylorax.api.recipes import recipe_from_file from pylorax.api.recipes import recipe_from_file
from pylorax.base import DataHolder from pylorax.base import DataHolder
@ -168,10 +169,13 @@ def make_compose(cfg, results_dir):
cfg_dict["armplatform"] = "" cfg_dict["armplatform"] = ""
cfg_dict["squashfs_args"] = None cfg_dict["squashfs_args"] = None
cfg_dict["lorax_templates"] = cfg.share_dir cfg_dict["lorax_templates"] = find_templates(cfg.share_dir)
cfg_dict["tmp"] = "/var/tmp/" cfg_dict["tmp"] = "/var/tmp/"
cfg_dict["dracut_args"] = None # Use default args for dracut cfg_dict["dracut_args"] = None # Use default args for dracut
# TODO How to support other arches?
cfg_dict["arch"] = None
# Compose things in a temporary directory inside the results directory # Compose things in a temporary directory inside the results directory
cfg_dict["result_dir"] = joinpaths(results_dir, "compose") cfg_dict["result_dir"] = joinpaths(results_dir, "compose")
os.makedirs(cfg_dict["result_dir"]) os.makedirs(cfg_dict["result_dir"])