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