|
 |
610fa1 |
From 89766dae2418fb8fd9d54b7ce1d93a11d5faecdd Mon Sep 17 00:00:00 2001
|
|
|
610fa1 |
From: Cole Robinson <crobinso@redhat.com>
|
|
|
610fa1 |
Date: Wed, 7 Apr 2021 09:37:53 -0400
|
|
|
610fa1 |
Subject: [PATCH] installer: Prefer xorrisofs over genisoimage/mkisofs
|
|
|
610fa1 |
|
|
|
610fa1 |
Apparently it's the most likely version to exist in distros these
|
|
|
610fa1 |
days. Particularly the other options may not be shipped in stock
|
|
|
610fa1 |
RHEL9
|
|
|
610fa1 |
|
|
|
610fa1 |
Signed-off-by: Cole Robinson <crobinso@redhat.com>
|
|
|
610fa1 |
(cherry picked from commit 3785abc6f0cb07c02ecc55760547a6f425513915)
|
|
|
610fa1 |
|
|
|
610fa1 |
Resolves: https://bugzilla.redhat.com/show_bug.cgi?id=1973236
|
|
|
610fa1 |
|
|
|
610fa1 |
Signed-off-by: Jonathon Jongsma <jjongsma@redhat.com>
|
|
|
610fa1 |
---
|
|
|
610fa1 |
virtinst/install/installerinject.py | 10 ++++++----
|
|
|
610fa1 |
1 file changed, 6 insertions(+), 4 deletions(-)
|
|
|
610fa1 |
|
|
|
610fa1 |
diff --git a/virtinst/install/installerinject.py b/virtinst/install/installerinject.py
|
|
|
610fa1 |
index 29150c8e..97742f6a 100644
|
|
|
610fa1 |
--- a/virtinst/install/installerinject.py
|
|
|
610fa1 |
+++ b/virtinst/install/installerinject.py
|
|
|
610fa1 |
@@ -45,10 +45,12 @@ def _run_initrd_commands(initrd, tempdir):
|
|
|
610fa1 |
|
|
|
610fa1 |
|
|
|
610fa1 |
def _run_iso_commands(iso, tempdir, cloudinit=False):
|
|
|
610fa1 |
- # Some distros do not link mkisofs to genisoimage (or vice-versa). As a
|
|
|
610fa1 |
- # result of this, we have to actually check for both programs and use the
|
|
|
610fa1 |
- # most appropriate one.
|
|
|
610fa1 |
- programs = ["genisoimage", "mkisofs"]
|
|
|
610fa1 |
+ # These three programs all behave similarly for our needs, and
|
|
|
610fa1 |
+ # different distros only have some available. xorriso is apparently
|
|
|
610fa1 |
+ # the actively maintained variant that should be available everywhere
|
|
|
610fa1 |
+ # and without any license issues. Some more info here:
|
|
|
610fa1 |
+ # https://wiki.debian.org/genisoimage
|
|
|
610fa1 |
+ programs = ["xorrisofs", "genisoimage", "mkisofs"]
|
|
|
610fa1 |
for program in programs:
|
|
|
610fa1 |
if shutil.which(program):
|
|
|
610fa1 |
break
|
|
|
610fa1 |
--
|
|
|
610fa1 |
2.31.1
|
|
|
610fa1 |
|