pungi/0001-createiso-don-t-run-isohybrid-if-we-re-using-xorriso.patch

31 lines
1.1 KiB
Diff
Raw Normal View History

From 6890d56b3f7b55d646fe4aba44df127988808064 Mon Sep 17 00:00:00 2001
From: Adam Williamson <awilliam@redhat.com>
Date: Thu, 16 Jun 2022 12:00:39 -0700
Subject: [PATCH] createiso: don't run isohybrid if we're using xorriso
isohybrid is part of syslinux and won't be available on this
path. We'll assume that on this path, lorax already made the
image hybrid and using xorriso will maintain that.
Signed-off-by: Adam Williamson <awilliam@redhat.com>
---
pungi/createiso.py | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/pungi/createiso.py b/pungi/createiso.py
index 4e1a5336..bc5e19f5 100644
--- a/pungi/createiso.py
+++ b/pungi/createiso.py
@@ -94,7 +94,7 @@ def run_isohybrid(f, opts):
be booted when written to USB disk. This is done by running isohybrid on
the image.
"""
- if opts.buildinstall_method and opts.arch in ["x86_64", "i386"]:
+ if opts.buildinstall_method and opts.arch in ["x86_64", "i386"] and not opts.use_xorrisofs:
cmd = iso.get_isohybrid_cmd(opts.iso_name, opts.arch)
emit(f, cmd)
--
2.36.1