From 3f560ceebe19171897a5af11539e5e0e20625810 Mon Sep 17 00:00:00 2001
From: "Jason N." <33561705+JasonN3@users.noreply.github.com>
Date: Wed, 20 Mar 2024 10:40:31 -0400
Subject: [PATCH] rhel specific items

---
 .github/workflows/build_iso.yml | 1 +
 Makefile                        | 4 ++++
 2 files changed, 5 insertions(+)

diff --git a/.github/workflows/build_iso.yml b/.github/workflows/build_iso.yml
index 3e91d96..69ffb38 100644
--- a/.github/workflows/build_iso.yml
+++ b/.github/workflows/build_iso.yml
@@ -141,6 +141,7 @@ jobs:
           enrollment_password: ${{ needs.load_vars.outputs.ENROLLMENT_PASSWORD }}
           iso_name: ${{ needs.load_vars.outputs.IMAGE_NAME }}-${{ matrix.version }}.iso
           secrets_dir: ${{ matrix.rhel && '/github/workspace/ubi' || '' }}
+          repos: ${{ matrix.rhel && '/etc/yum.repos.d/redhat.repo' || '/etc/yum.repos.d/fedora.repo /etc/yum.repos.d/fedora-updates.repo' }}
 
       - name: Save output
         id: save_output
diff --git a/Makefile b/Makefile
index 5c7bca2..de119f6 100644
--- a/Makefile
+++ b/Makefile
@@ -150,7 +150,11 @@ build/deploy.iso: boot.iso container/$(IMAGE_NAME)-$(IMAGE_TAG) xorriso/input.tx
 
 external/lorax/branch-$(VERSION):
 	git config advice.detachedHead false
+ifeq ($(_RHEL),true)
+	cd external/lorax && git reset --hard HEAD && git checkout origin/rhel$(VERSION)-branch
+else
 	cd external/lorax && git reset --hard HEAD && git checkout tags/$(shell cd external/lorax && git tag -l lorax-$(VERSION).* --sort=creatordate | tail -n 1)
+endif
 	touch external/lorax/branch-$(VERSION)
 
 # Step 1: Generate Lorax Templates