From b39bc920234d550d4e17dc27a5a12972c8be52be Mon Sep 17 00:00:00 2001
From: "Jason N." <33561705+JasonN3@users.noreply.github.com>
Date: Wed, 20 Mar 2024 13:48:33 -0400
Subject: [PATCH] what's in results

---
 Containerfile | 1 -
 Makefile      | 9 +++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/Containerfile b/Containerfile
index b2e6cd4..10d091d 100644
--- a/Containerfile
+++ b/Containerfile
@@ -22,7 +22,6 @@ VOLUME /build-container-installer/repos
 VOLUME /cache
 
 RUN if [[ "$(grep '^ID=' /etc/os-release)" == 'ID="rhel"' ]]; then dnf install -y coreutils --allowerasing; fi; dnf install -y make && make install-deps
-RUN ln -s /run/secrets/etc-pki-entitlement /etc/pki/entitlement-host && ln -s /run/secrets/rhsm /etc/rhsm-host
 
 ENTRYPOINT ["/bin/bash", "/build-container-installer/entrypoint.sh"]
 
diff --git a/Makefile b/Makefile
index de119f6..142aec2 100644
--- a/Makefile
+++ b/Makefile
@@ -167,8 +167,12 @@ repos: $(_REPO_FILES)
 repos/%.repo: /etc/yum.repos.d/%.repo
 	mkdir repos || true
 	cp /etc/yum.repos.d/$*.repo           $(_BASE_DIR)/repos/$*.repo
-	sed -i "s/\$$releasever/${VERSION}/g" $(_BASE_DIR)/repos/$*.repo
-	sed -i "s/\$$basearch/${ARCH}/g"      $(_BASE_DIR)/repos/$*.repo
+ifeq ($(_RHEL),true)
+	sed -i "s/\/rhel[0-9]+\//\/rhel$(VERSION)\//g" $(_BASE_DIR)/repos/$*.repo
+else
+	sed -i "s/\$$releasever/$(VERSION)/g" $(_BASE_DIR)/repos/$*.repo
+	sed -i "s/\$$basearch/$(ARCH)/g"      $(_BASE_DIR)/repos/$*.repo
+endif
 
 # Step 3: Build boot.iso using Lorax
 boot.iso: external/lorax/branch-$(VERSION) $(filter lorax_templates/%,$(_LORAX_TEMPLATES)) $(_REPO_FILES)
@@ -202,6 +206,7 @@ container/$(IMAGE_NAME)-$(IMAGE_TAG):
 
 # Step 5: Generate xorriso script
 xorriso/%.sh: xorriso/%.sh.in
+	find results
 	sed -i 's/quiet/quiet $(EXTRA_BOOT_PARAMS)/g' results/boot/grub2/grub.cfg
 	sed -i 's/quiet/quiet $(EXTRA_BOOT_PARAMS)/g' results/EFI/BOOT/grub.cfg
 	$(eval _VARS = IMAGE_NAME IMAGE_TAG ARCH VERSION)