Blob Blame History Raw
From 89766dae2418fb8fd9d54b7ce1d93a11d5faecdd Mon Sep 17 00:00:00 2001
From: Cole Robinson <crobinso@redhat.com>
Date: Wed, 7 Apr 2021 09:37:53 -0400
Subject: [PATCH] installer: Prefer xorrisofs over genisoimage/mkisofs

Apparently it's the most likely version to exist in distros these
days. Particularly the other options may not be shipped in stock
RHEL9

Signed-off-by: Cole Robinson <crobinso@redhat.com>
(cherry picked from commit 3785abc6f0cb07c02ecc55760547a6f425513915)

Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1973236

Signed-off-by: Jonathon Jongsma <jjongsma@redhat.com>
---
 virtinst/install/installerinject.py | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/virtinst/install/installerinject.py b/virtinst/install/installerinject.py
index 29150c8e..97742f6a 100644
--- a/virtinst/install/installerinject.py
+++ b/virtinst/install/installerinject.py
@@ -45,10 +45,12 @@ def _run_initrd_commands(initrd, tempdir):
 
 
 def _run_iso_commands(iso, tempdir, cloudinit=False):
-    # Some distros do not link mkisofs to genisoimage (or vice-versa). As a
-    # result of this, we have to actually check for both programs and use the
-    # most appropriate one.
-    programs = ["genisoimage", "mkisofs"]
+    # These three programs all behave similarly for our needs, and
+    # different distros only have some available. xorriso is apparently
+    # the actively maintained variant that should be available everywhere
+    # and without any license issues. Some more info here:
+    # https://wiki.debian.org/genisoimage
+    programs = ["xorrisofs", "genisoimage", "mkisofs"]
     for program in programs:
         if shutil.which(program):
             break
-- 
2.31.1