From 8af330d3224e3e5aadddabc7d0f5d828a004ae97 Mon Sep 17 00:00:00 2001
From: "Jason N." <33561705+JasonN3@users.noreply.github.com>
Date: Tue, 12 Mar 2024 06:29:58 -0400
Subject: [PATCH 1/2] move completely out of dir

---
 Makefile | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index 0c46523f..9017ccd1 100644
--- a/Makefile
+++ b/Makefile
@@ -37,6 +37,7 @@ _LORAX_ARGS =
 _FLATPAK_REPO_URL = $(shell curl -L $(FLATPAK_REMOTE_URL) | grep -i '^URL=' | cut -d= -f2)
 _FLATPAK_REPO_GPG = $(shell curl -L $(FLATPAK_REMOTE_URL) | grep -i '^GPGKey=' | cut -d= -f2)
 _TEMPLATE_VARS = ARCH IMAGE_NAME IMAGE_REPO _IMAGE_REPO_DOUBLE_ESCAPED _IMAGE_REPO_ESCAPED IMAGE_TAG REPOS VARIANT VERSION WEB_UI
+_TEMP_DIR = $(shell mktemp -d)
 
 
 ifeq ($(findstring redhat.repo,$(REPOS)),redhat.repo)
@@ -162,8 +163,8 @@ repos/%.repo: /etc/yum.repos.d/%.repo
 # Step 3: Build boot.iso using Lorax
 boot.iso: $(filter lorax_templates/%,$(_LORAX_TEMPLATES)) $(_REPO_FILES)
 	rm -Rf $(_BASE_DIR)/results || true
-	mv /etc/rpm/macros.image-language-conf /etc/rpm/macros.image-language-conf.orig || true
-	cp /etc/os-release /etc/os-release.orig || true
+	mv /etc/rpm/macros.image-language-conf $(_TEMP_DIR)/macros.image-language-conf || true
+	cp /etc/os-release $(_TEMP_DIR)/os-release || true
 	sed -i 's/PLATFORM_ID=.*/PLATFORM_ID="$(_PLATFORM_ID)"/' /etc/os-release
 
 	# Download the secure boot key
@@ -184,8 +185,8 @@ boot.iso: $(filter lorax_templates/%,$(_LORAX_TEMPLATES)) $(_REPO_FILES)
 		$(foreach var,$(_TEMPLATE_VARS),--add-template-var "$(shell echo $(var) | tr '[:upper:]' '[:lower:]')=$($(var))") \
 		$(_BASE_DIR)/results/
 	mv $(_BASE_DIR)/results/images/boot.iso $(_BASE_DIR)/
-	mv -f /etc/rpm/macros.image-language-conf.orig /etc/rpm/macros.image-language-conf || true
-	mv -f /etc/os-release.orig /etc/os-release || true
+	mv -f $(_TEMP_DIR)/macros.image-language-conf /etc/rpm/macros.image-language-conf || true
+	mv -f $(_TEMP_DIR)/os-release /etc/os-release || true
 
 # Step 4: Download container image
 container/$(IMAGE_NAME)-$(IMAGE_TAG):

From 8af88e61c0db6c56cc195569425949e4f1f6d5c8 Mon Sep 17 00:00:00 2001
From: "Jason N." <33561705+JasonN3@users.noreply.github.com>
Date: Tue, 12 Mar 2024 08:06:58 -0400
Subject: [PATCH 2/2] disable skopeo cache

---
 action.yml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/action.yml b/action.yml
index 09c4b849..16fb2a8d 100644
--- a/action.yml
+++ b/action.yml
@@ -23,7 +23,7 @@ inputs:
   enable_cache_skopeo: 
     description: Whether to enable caching for skopeo
     required: false
-    default: "true"
+    default: "false"
   enrollment_password:
     description: Used for supporting secure boot (requires secure_boot_key_url to be defined)
     required: false