From 54a458af5c4440dc9c96092976743c39c3221e55 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Ond=C5=99ej=20Budai?= <ondrej@budai.cz>
Date: Wed, 31 Mar 2021 13:06:46 +0200
Subject: [PATCH] test: replace genisoimage with mkisofs
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

genisoimage might be removed from RHEL 9. The users are advised to switch
to mkisofs tools from the xorriso package. It should be a drop-in replacement.

The same change was recently done by libguestfs:

https://github.com/libguestfs/libguestfs/commit/efb8a766cac4ba8e413594946136bf91e176bb8c
https://github.com/libguestfs/libguestfs/commit/2216ab2e328457ef172d6bfa534272edf2f81a3a

Signed-off-by: Ondřej Budai <ondrej@budai.cz>
---
 internal/boot/context-managers.go                  | 2 +-
 osbuild-composer.spec                              | 2 +-
 tools/deploy-qemu                                  | 2 +-
 tools/libvirt_test.sh                              | 2 +-
 tools/test-case-generators/generate-all-test-cases | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/internal/boot/context-managers.go b/internal/boot/context-managers.go
index af714850d..de43bc35e 100644
--- a/internal/boot/context-managers.go
+++ b/internal/boot/context-managers.go
@@ -75,7 +75,7 @@ func withTempDir(dir, pattern string, f func(dir string) error) error {
 // metaData and writes it to the writer
 func writeCloudInitISO(writer io.Writer, userData, metaData string) error {
 	isoCmd := exec.Command(
-		"genisoimage",
+		"mkisofs",
 		"-quiet",
 		"-input-charset", "utf-8",
 		"-volid", "cidata",
diff --git a/osbuild-composer.spec b/osbuild-composer.spec
index e4f0d0d04..93794bbee 100644
--- a/osbuild-composer.spec
+++ b/osbuild-composer.spec
@@ -311,7 +311,7 @@ Summary:    Integration tests
 Requires:   %{name} = %{version}-%{release}
 Requires:   composer-cli
 Requires:   createrepo_c
-Requires:   genisoimage
+Requires:   xorriso
 Requires:   qemu-kvm-core
 Requires:   systemd-container
 Requires:   jq
diff --git a/tools/deploy-qemu b/tools/deploy-qemu
index 301ce45f6..94f08f4ee 100755
--- a/tools/deploy-qemu
+++ b/tools/deploy-qemu
@@ -44,7 +44,7 @@ echo -e "instance-id: nocloud\nlocal-hostname: vm\n" > "$workdir/cidata/meta-dat
 
 case $(uname -s) in
   "Linux")
-    genisoimage \
+    mkisofs \
       -input-charset utf-8 \
       -output "$workdir/cloudinit.iso" \
       -volid cidata \
diff --git a/tools/libvirt_test.sh b/tools/libvirt_test.sh
index 432cee154..2e91da321 100755
--- a/tools/libvirt_test.sh
+++ b/tools/libvirt_test.sh
@@ -228,7 +228,7 @@ greenprint "💿 Creating a cloud-init ISO"
 CLOUD_INIT_PATH=/var/lib/libvirt/images/seed.iso
 rm -f $CLOUD_INIT_PATH
 pushd "$CLOUD_INIT_DIR"
-    sudo genisoimage -o $CLOUD_INIT_PATH -V cidata \
+    sudo mkisofs -o $CLOUD_INIT_PATH -V cidata \
         -r -J user-data meta-data network-config > /dev/null 2>&1
 popd
 
diff --git a/tools/test-case-generators/generate-all-test-cases b/tools/test-case-generators/generate-all-test-cases
index 571dbb96c..596b1727d 100755
--- a/tools/test-case-generators/generate-all-test-cases
+++ b/tools/test-case-generators/generate-all-test-cases
@@ -437,7 +437,7 @@ class BaseRunner(contextlib.AbstractContextManager):
         if sysname == "Linux":
             subprocess.check_call(
                 [
-                    "genisoimage",
+                    "mkisofs",
                     "-input-charset", "utf-8",
                     "-output", iso_path,
                     "-volid", "cidata",