From 797f1b46ac306625d96d7b6cd4c592896b82e7de Mon Sep 17 00:00:00 2001
From: Pedro Falcato <pedro.falcato@gmail.com>
Date: Sun, 10 Sep 2023 18:37:59 +0100
Subject: [PATCH] iso: Support RHEL-derived distros

Several distros (Fedora is the most common one) have grub commands
prefixed grub2- instead of grub-. So support that in iso.sh by
autodetecting the command.

Signed-off-by: Pedro Falcato <pedro.falcato@gmail.com>
---
 scripts/iso.sh | 18 +++++++++++++++---
 1 file changed, 15 insertions(+), 3 deletions(-)

diff --git a/scripts/iso.sh b/scripts/iso.sh
index 8a8003c85..5aed23879 100755
--- a/scripts/iso.sh
+++ b/scripts/iso.sh
@@ -8,7 +8,7 @@ mkdir -p isodir/boot/grub
 INITRD_GEN_SCRIPT=$1
 
 if [ "$INITRD_GEN_SCRIPT" = "" ]; then
-    INITRD_GEN_SCRIPT="scripts/default-initrd.sh"
+	INITRD_GEN_SCRIPT="scripts/default-initrd.sh"
 fi
 
 SYSTEM_ROOT=$DESTDIR scripts/geninitrd "$INITRD_GEN_SCRIPT"
@@ -21,7 +21,7 @@ echo "Compressing kernel"
 xz -9 -e -f isodir/boot/vmonyx
 #zstd -15 isodir/boot/vmonyx
 
-cat > isodir/boot/grub/grub.cfg << EOF
+cat >isodir/boot/grub/grub.cfg <<EOF
 set default="0"
 set timeout=5
 menuentry "Onyx" {
@@ -40,4 +40,16 @@ menuentry "Onyx" {
     boot
 }
 EOF
-grub-mkrescue -o Onyx.iso isodir # Change this acording to your distro/OS.
+
+GRUB_MKRESCUE=""
+
+if command -v grub-mkrescue; then
+	GRUB_MKRESCUE="grub-mkrescue"
+elif command -v grub2-mkrescue; then
+	GRUB_MKRESCUE="grub2-mkrescue"
+else
+	echo "grub-mkrescue not found! Please install it."
+	exit 1
+fi
+
+$GRUB_MKRESCUE -o Onyx.iso isodir