From 3c5853c7e5bf384337f0a562cb048e4808226dc2 Mon Sep 17 00:00:00 2001
From: Lleyton Gray <lleyton@fyralabs.com>
Date: Mon, 16 Dec 2024 16:37:46 -0800
Subject: [PATCH] feat: switch to readymade

---
 katsu/modules/flagship/flagship-live.yaml | 1 +
 katsu/modules/gnome/gnome-live.sh         | 8 ++++----
 katsu/modules/gnome/gnome-live.yaml       | 1 +
 katsu/modules/live/anaconda.yaml          | 8 ++++++++
 katsu/modules/live/live.yaml              | 4 ----
 katsu/modules/live/readymade.yaml         | 5 +++++
 katsu/modules/plasma/plasma-live.yaml     | 1 +
 katsu/modules/xfce/xfce-live.yaml         | 1 +
 8 files changed, 21 insertions(+), 8 deletions(-)
 create mode 100644 katsu/modules/live/anaconda.yaml
 create mode 100644 katsu/modules/live/readymade.yaml

diff --git a/katsu/modules/flagship/flagship-live.yaml b/katsu/modules/flagship/flagship-live.yaml
index 9db8578a..6898a500 100644
--- a/katsu/modules/flagship/flagship-live.yaml
+++ b/katsu/modules/flagship/flagship-live.yaml
@@ -3,6 +3,7 @@ builder: dnf
 import:
   - ../base/base.yaml
   - ../live/live.yaml
+  - ../live/readymade.yaml
   - flagship.yaml
 
 distro: Ultramarine Linux 41 (Flagship Edition)
diff --git a/katsu/modules/gnome/gnome-live.sh b/katsu/modules/gnome/gnome-live.sh
index 92bdd4ff..a28cf4f4 100644
--- a/katsu/modules/gnome/gnome-live.sh
+++ b/katsu/modules/gnome/gnome-live.sh
@@ -1,6 +1,6 @@
 #!/bin/bash -x
 
-sed -i 's/^livesys_session=.*/livesys_session="gnome"/' /etc/sysconfig/livesys
-sed -i 's/Fedora/Ultramarine/g' /usr/share/anaconda/gnome/fedora-welcome
-sed -i 's/Fedora/Ultramarine/g' /usr/share/applications/org.fedoraproject.welcome-screen.desktop
-sed -i 's/Fedora/Ultramarine/g' /usr/share/anaconda/gnome/org.fedoraproject.welcome-screen.desktop
+# sed -i 's/^livesys_session=.*/livesys_session="gnome"/' /etc/sysconfig/livesys
+# sed -i 's/Fedora/Ultramarine/g' /usr/share/anaconda/gnome/fedora-welcome
+# sed -i 's/Fedora/Ultramarine/g' /usr/share/applications/org.fedoraproject.welcome-screen.desktop
+# sed -i 's/Fedora/Ultramarine/g' /usr/share/anaconda/gnome/org.fedoraproject.welcome-screen.desktop
diff --git a/katsu/modules/gnome/gnome-live.yaml b/katsu/modules/gnome/gnome-live.yaml
index f42b5f95..c7718c97 100644
--- a/katsu/modules/gnome/gnome-live.yaml
+++ b/katsu/modules/gnome/gnome-live.yaml
@@ -3,6 +3,7 @@ builder: dnf
 import:
   - ../base/base.yaml
   - ../live/live.yaml
+  - ../live/readymade.yaml
   - gnome.yaml
 
 distro: Ultramarine GNOME 41
diff --git a/katsu/modules/live/anaconda.yaml b/katsu/modules/live/anaconda.yaml
new file mode 100644
index 00000000..4b8326bd
--- /dev/null
+++ b/katsu/modules/live/anaconda.yaml
@@ -0,0 +1,8 @@
+dnf:
+  releasever: 41
+  exec: dnf4
+  packages:
+    - anaconda-dracut
+    - anaconda-live
+    - anaconda-install-env-deps
+    - "@anaconda-tools"
diff --git a/katsu/modules/live/live.yaml b/katsu/modules/live/live.yaml
index 90489801..be0ea199 100644
--- a/katsu/modules/live/live.yaml
+++ b/katsu/modules/live/live.yaml
@@ -22,10 +22,6 @@ dnf:
     - dracut-config-generic
     - dracut-network
     - dracut-squash
-    - anaconda-dracut
-    - anaconda-live
-    - anaconda-install-env-deps
-    - "@anaconda-tools"
     - libblockdev-nvdimm
     - isomd5sum
     - orca
diff --git a/katsu/modules/live/readymade.yaml b/katsu/modules/live/readymade.yaml
new file mode 100644
index 00000000..d5669e09
--- /dev/null
+++ b/katsu/modules/live/readymade.yaml
@@ -0,0 +1,5 @@
+dnf:
+  releasever: 41
+  exec: dnf4
+  packages:
+    - readymade
diff --git a/katsu/modules/plasma/plasma-live.yaml b/katsu/modules/plasma/plasma-live.yaml
index 28405dc6..7514366e 100644
--- a/katsu/modules/plasma/plasma-live.yaml
+++ b/katsu/modules/plasma/plasma-live.yaml
@@ -3,6 +3,7 @@ builder: dnf
 import:
   - ../base/base.yaml
   - ../live/live.yaml
+  - ../live/readymade.yaml
   - plasma.yaml
 
 distro: Ultramarine Linux 41 (Plasma Edition)
diff --git a/katsu/modules/xfce/xfce-live.yaml b/katsu/modules/xfce/xfce-live.yaml
index a1e3bc79..f8e1cda7 100644
--- a/katsu/modules/xfce/xfce-live.yaml
+++ b/katsu/modules/xfce/xfce-live.yaml
@@ -3,6 +3,7 @@ builder: dnf
 import:
   - ../base/base.yaml
   - ../live/live.yaml
+  - ../live/readymade.yaml
   - xfce.yaml
 
 distro: Ultramarine Linux 41 (Xfce Edition)