From d5851d33b1f31b74f62dd11ee7c9c0920959e3e6 Mon Sep 17 00:00:00 2001
From: "Jason N." <33561705+JasonN3@users.noreply.github.com>
Date: Thu, 15 Feb 2024 18:26:12 +0000
Subject: [PATCH] add tag and web_ui support

---
 Makefile                                   | 13 ++++++++++---
 lorax_templates/configure_upgrades.tmpl.in |  6 +++++-
 2 files changed, 15 insertions(+), 4 deletions(-)

diff --git a/Makefile b/Makefile
index d384476..4f9398e 100644
--- a/Makefile
+++ b/Makefile
@@ -3,7 +3,9 @@ version = 39
 base_dir = $(shell pwd)
 image_repo = ghcr.io/ublue-os
 image_name = base-main
+image_tag = $(version)
 variant = Silverblue
+web_ui = false
 
 image_repo_escaped = $(subst /,\/,$(image_repo))
 image_repo_double_escaped = $(subst \,\\\,$(image_repo_escaped))
@@ -14,6 +16,10 @@ else
 lorax_args = --nomacboot
 endif
 
+ifeq ($(webui),'true')
+lorax_args += -i anaconda-webui
+endif
+
 $(image_name)-$(version).iso: boot.iso container/$(image_name)-$(version) xorriso/input.txt 
 	xorriso -dialog on < $(base_dir)/xorriso/input.txt
 
@@ -24,6 +30,7 @@ boot.iso: lorax_templates/set_installer.tmpl lorax_templates/configure_upgrades.
           $(lorax_args) \
           --repo /etc/yum.repos.d/fedora.repo \
           --repo /etc/yum.repos.d/fedora-updates.repo \
+		  --repo /etc/yum.repos.d/fedora-rawhide.repo \
           --add-template $(base_dir)/lorax_templates/set_installer.tmpl \
 		  --add-template $(base_dir)/lorax_templates/configure_upgrades.tmpl \
           $(base_dir)/results/
@@ -31,9 +38,9 @@ boot.iso: lorax_templates/set_installer.tmpl lorax_templates/configure_upgrades.
 
 container/$(image_name)-$(version):
 	mkdir container
-	podman pull $(image_repo)/$(image_name):$(version)
-	podman save --format oci-dir -o $(base_dir)/container/$(image_name)-$(version) $(image_repo)/$(image_name):$(version)
-	podman rmi $(image_repo)/$(image_name):$(version)
+	podman pull $(image_repo)/$(image_name):$(image_tag)
+	podman save --format oci-dir -o $(base_dir)/container/$(image_name)-$(version) $(image_repo)/$(image_name):$(image_tag)
+	podman rmi $(image_repo)/$(image_name):$(image_tag)
 
 install-deps:
 	dnf install -y lorax xorriso podman git rpm-ostree
diff --git a/lorax_templates/configure_upgrades.tmpl.in b/lorax_templates/configure_upgrades.tmpl.in
index 2bbb92a..498bf25 100644
--- a/lorax_templates/configure_upgrades.tmpl.in
+++ b/lorax_templates/configure_upgrades.tmpl.in
@@ -1,3 +1,7 @@
 append usr/share/anaconda/interactive-defaults.ks "%post --erroronfail"
 append usr/share/anaconda/interactive-defaults.ks "sed -i 's/container-image-reference=.*/container-image-reference=ostree-image-signed:docker:\/\/@IMAGE_REPO_ESCAPED@\/@IMAGE_NAME@:@VERSION@/' /ostree/deploy/default/deploy/*.origin"
-append usr/share/anaconda/interactive-defaults.ks "%end"
\ No newline at end of file
+append usr/share/anaconda/interactive-defaults.ks "%end"
+
+append usr/share/anaconda/post-scripts/configure_upgrades.ks "%post --erroronfail"
+append usr/share/anaconda/post-scripts/configure_upgrades.ks "sed -i 's/container-image-reference=.*/container-image-reference=ostree-image-signed:docker:\/\/@IMAGE_REPO_ESCAPED@\/@IMAGE_NAME@:@VERSION@/' /ostree/deploy/default/deploy/*.origin"
+append usr/share/anaconda/post-scripts/configure_upgrades.ks "%end"
\ No newline at end of file