From 1a9377252db9ef980fec61ffe2f784fe4667978b Mon Sep 17 00:00:00 2001
From: "Jason N." <33561705+JasonN3@users.noreply.github.com>
Date: Sat, 30 Mar 2024 19:14:21 -0400
Subject: [PATCH] set ISO_NAME

---
 .github/workflows/test_deployment.yml | 2 +-
 test/vm/Makefile                      | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/test_deployment.yml b/.github/workflows/test_deployment.yml
index 01ceecd..3d42905 100644
--- a/.github/workflows/test_deployment.yml
+++ b/.github/workflows/test_deployment.yml
@@ -90,7 +90,7 @@ jobs:
 
       - name: Add Kickstart and Grub options to ISO
         run: |
-          make test/vm/files/install.iso
+          make test/vm/files/install.iso ISO_NAME=${{ inputs[format('iso_name-{0}', matrix.version)] }}
 
       - name: Create VM disk
         run: |
diff --git a/test/vm/Makefile b/test/vm/Makefile
index 3729ebb..c23477a 100644
--- a/test/vm/Makefile
+++ b/test/vm/Makefile
@@ -53,7 +53,7 @@ install-deps:
 files/mnt/iso:
 	$(if $(wildcard files/mnt),,mkdir files/mnt)
 	$(if $(wildcard files/mnt/iso),,mkdir files/mnt/iso)
-	sudo mount -o loop $(ISO_NAME) files/mnt/iso
+	sudo mount -o loop ../../$(ISO_NAME) files/mnt/iso
 
 files/grub.cfg: files/mnt/iso
 	cp files/mnt/iso/boot/grub2/grub.cfg files/grub.cfg
@@ -61,13 +61,13 @@ files/grub.cfg: files/mnt/iso
 	sed -i 's/set default="1"/set default="0"/'                     files/grub.cfg
 	sed -i 's/set timeout=60/set timeout=1/'                        files/grub.cfg
 
-.PHONY: remove_files/mnt/iso
-remove_files/mnt/iso: files/mnt/iso
+.PHONY: clean
+clean: files/mnt/iso
 	sudo umount files/mnt/iso
 	rmdir files/mnt/iso
 
 
-files/install.iso: files/grub.cfg remove_files/mnt/iso
+files/install.iso: files/grub.cfg
 	xorriso -dialog on << EOF
 	-indev $(ISO_NAME)
 	-outdev files/install.iso