From 5ca80da56d44d1da46c5ee561677aefe916dbb00 Mon Sep 17 00:00:00 2001 From: nazunalika Date: Mon, 27 Jun 2022 01:13:12 -0700 Subject: [PATCH] wrong path was being used for grafts --- iso/empanadas/empanadas/util/iso_utils.py | 35 +++++++++++------------ 1 file changed, 16 insertions(+), 19 deletions(-) diff --git a/iso/empanadas/empanadas/util/iso_utils.py b/iso/empanadas/empanadas/util/iso_utils.py index e986493..3ca46c1 100644 --- a/iso/empanadas/empanadas/util/iso_utils.py +++ b/iso/empanadas/empanadas/util/iso_utils.py @@ -1046,6 +1046,22 @@ class IsoBuild: 'iso_level': self.iso_map['iso_level'], } + if opts['use_xorrisofs']: + # Generate a xorriso compatible dialog + xp = open(grafts) + xorpoint = xp.read() + xp.close() + xorriso_template_output = xorriso_template.render( + boot_iso=boot_iso, + isoname=isoname, + volid=volid, + graft=xorpoint, + ) + xorriso_template_entry = open(xorriso_template_path, "w+") + xorriso_template_entry.write(xorriso_template_output) + xorriso_template_entry.close() + opts['graft_points'] = xorriso_template_path + make_image = '{} {}'.format(self._get_make_image_cmd(opts), log_path_command) isohybrid = self._get_isohybrid_cmd(opts) implantmd5 = self._get_implantisomd5_cmd(opts) @@ -1062,25 +1078,6 @@ class IsoBuild: lorax_pkg_cmd=lorax_pkg_cmd, ) - if opts['use_xorrisofs']: - # Here we generate another template instead for xorrisofs. We'll do - # manual writes for now instead of a template. I'm too tired, it's - # 1am, and I can't rationally think of how to do this in jinja (I - # know it's easy, it's just too late) - xp = open(grafts) - xorpoint = xp.read() - xp.close() - xorriso_template_output = xorriso_template.render( - boot_iso=boot_iso, - isoname=isoname, - volid=volid, - graft=xorpoint, - ) - xorriso_template_entry = open(xorriso_template_path, "w+") - xorriso_template_entry.write(xorriso_template_output) - xorriso_template_entry.close() - - mock_iso_entry = open(mock_iso_path, "w+") mock_iso_entry.write(mock_iso_template_output) mock_iso_entry.close()