From 03fb87452891cb5e5048d0c552d06356ec9b901f Mon Sep 17 00:00:00 2001
From: Jason Nagin <33561705+JasonN3@users.noreply.github.com>
Date: Tue, 29 Oct 2024 11:24:48 -0400
Subject: [PATCH] ensure flatpak is installed

---
 flatpaks/Makefile                     | 1 +
 lorax_templates/flatpak_set_repo.tmpl | 1 +
 2 files changed, 2 insertions(+)

diff --git a/flatpaks/Makefile b/flatpaks/Makefile
index 3b6e939..fc22df3 100644
--- a/flatpaks/Makefile
+++ b/flatpaks/Makefile
@@ -14,6 +14,7 @@ repo: script.sh
 
 script.sh:
 	cat << EOF > script.sh
+	dnf install -y flatpak
 	mkdir -p /flatpak/flatpak /flatpak/triggers
 	mkdir /var/tmp || true
 	chmod -R 1777 /var/tmp
diff --git a/lorax_templates/flatpak_set_repo.tmpl b/lorax_templates/flatpak_set_repo.tmpl
index b7fae2d..0015349 100644
--- a/lorax_templates/flatpak_set_repo.tmpl
+++ b/lorax_templates/flatpak_set_repo.tmpl
@@ -2,6 +2,7 @@
 % if int(version) >= 41:
 append etc/anaconda/conf.d/anaconda.conf "[Payload]"
 append etc/anaconda/conf.d/anaconda.conf "flatpak_remote = ${flatpak_remote_name} ${_flatpak_repo_url}"
+#replace "fedora  oci+https://registry.fedoraproject.org" "${flatpak_remote_name} ${_flatpak_repo_url}" etc/anaconda/anaconda.conf
 % else:
 replace "flatpak_manager\.add_remote\(\".*\", \".*\"\)" "flatpak_manager.add_remote(\"${flatpak_remote_name}\", \"${_flatpak_repo_url}\")" /usr/lib64/python*/site-packages/pyanaconda/modules/payloads/payload/rpm_ostree/flatpak_installation.py
 replace "flatpak_manager\.replace_installed_refs_remote\(\".*\"\)" "flatpak_manager.replace_installed_refs_remote(\"${flatpak_remote_name}\")" /usr/lib64/python*/site-packages/pyanaconda/modules/payloads/payload/rpm_ostree/flatpak_installation.py