sshtepa/toolkit
1
0
Fork 0
forked from sig_core/toolkit
Code Pull Requests Activity

try logging some stuff

Browse Source
This commit is contained in:
Louis Abel 2022-06-27 00:40:28 -07:00
parent 6d239b48e9
commit 0ac1b0ba96
Signed by untrusted user: label
GPG Key ID: B37E62D143879B36
2 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
iso/empanadas/empanadas/templates/buildExtraImage.tmpl.sh
View File

@ -2,7 +2,7 @@
set -ex set -ex
{% if extra_iso_mode == "podman" %} {% if extra_iso_mode == "podman" %}
{{ lorax_pkg_cmd }} | tee -a {{ log_path }} {{ lorax_pkg_cmd }}
mkdir -p {{ compose_work_iso_dir }}/{{ arch }} mkdir -p {{ compose_work_iso_dir }}/{{ arch }}
cd {{ compose_work_iso_dir }}/{{ arch }} cd {{ compose_work_iso_dir }}/{{ arch }}
{% else %} {% else %}
@ -14,11 +14,11 @@ fi
{% endif %} {% endif %}
{{ make_image }} | tee -a {{ log_path }} {{ make_image }}
{{ isohybrid }} | tee -a {{ log_path }} {{ isohybrid }}
{{ implantmd5 }} | tee -a {{ log_path }} {{ implantmd5 }}
{{ make_manifest }} | tee -a {{ log_path }} {{ make_manifest }}

10
iso/empanadas/empanadas/util/iso_utils.py
View File

@ -973,7 +973,7 @@ class IsoBuild:
if not os.path.exists(log_root): if not os.path.exists(log_root):
os.makedirs(log_root, exist_ok=True) os.makedirs(log_root, exist_ok=True)
log_path = '{}/{}-{}.log'.format(log_root, arch, image) log_path_command = '| tee -a {}/{}-{}.log'.format(log_root, arch, image)
# This is kind of a hack. Installing xorrisofs sets the alternatives to # This is kind of a hack. Installing xorrisofs sets the alternatives to
# it, so backwards compatibility is sort of guaranteed. But we want to # it, so backwards compatibility is sort of guaranteed. But we want to
@ -1008,8 +1008,9 @@ class IsoBuild:
image image
) )
lorax_pkg_cmd = '/usr/bin/dnf install {} -y'.format( lorax_pkg_cmd = '/usr/bin/dnf install {} -y {}'.format(
' '.join(required_pkgs) ' '.join(required_pkgs),
log_path_command
) )
mock_iso_template_output = mock_iso_template.render( mock_iso_template_output = mock_iso_template.render(
@ -1045,7 +1046,7 @@ class IsoBuild:
'iso_level': self.iso_map['iso_level'], 'iso_level': self.iso_map['iso_level'],
} }
make_image = self._get_make_image_cmd(opts) make_image = '{} {}'.format(self._get_make_image_cmd(opts), log_path_command)
isohybrid = self._get_isohybrid_cmd(opts) isohybrid = self._get_isohybrid_cmd(opts)
implantmd5 = self._get_implantisomd5_cmd(opts) implantmd5 = self._get_implantisomd5_cmd(opts)
make_manifest = self._get_manifest_cmd(opts) make_manifest = self._get_manifest_cmd(opts)
@ -1059,7 +1060,6 @@ class IsoBuild:
implantmd5=implantmd5, implantmd5=implantmd5,
make_manifest=make_manifest, make_manifest=make_manifest,
lorax_pkg_cmd=lorax_pkg_cmd, lorax_pkg_cmd=lorax_pkg_cmd,
log_path=log_path,
) )
if opts['use_xorrisofs']: if opts['use_xorrisofs']: