From 388198daf44feb01f58f314f41a088eb4503a385 Mon Sep 17 00:00:00 2001
From: Skip Grube <sgrube@ciq.com>
Date: Mon, 26 Aug 2024 10:49:04 -0400
Subject: [PATCH] Fixes for installer and Software app

- Added PackageKit/pkcon refresh to build process - Software app should come pre-cached
- Dropped kdump plugin Anaconda package
- Added end-user Anaconda storage simplified defaults
- Increased default setting+requirements for /boot partition in Anaconda
---
 include/010_repos_pkgs.ks |  1 +
 include/030_disk.ks       |  2 +-
 include/050_post_fixes.ks | 32 +++++++++++++++++++++++++++++++-
 3 files changed, 33 insertions(+), 2 deletions(-)

diff --git a/include/010_repos_pkgs.ks b/include/010_repos_pkgs.ks
index 29396bd..85e7bb2 100644
--- a/include/010_repos_pkgs.ks
+++ b/include/010_repos_pkgs.ks
@@ -60,6 +60,7 @@ kernel-lt-tools
 -kernel-modules-extra
 -vdo
 -kmod-kvdo
+-kdump-anaconda-addon
 
 # Nvidia + gfx:
 kmod-nvidia-latest-dkms
diff --git a/include/030_disk.ks b/include/030_disk.ks
index 27fddbd..ff672eb 100644
--- a/include/030_disk.ks
+++ b/include/030_disk.ks
@@ -5,4 +5,4 @@ zerombr
 # Partition clearing information
 clearpart --all
 # Disk partitioning information
-part / --fstype="ext4" --size=15000
+part / --fstype="ext4" --size=30000
diff --git a/include/050_post_fixes.ks b/include/050_post_fixes.ks
index c53c32e..5caf6df 100644
--- a/include/050_post_fixes.ks
+++ b/include/050_post_fixes.ks
@@ -35,6 +35,7 @@ flatpak remote-ls &> /dev/null
 flatpak update
 dnf -y makecache
 
+pkcon refresh force -c -1 -v
 
 # Enable dkms service:
 systemctl enable dkms
@@ -47,10 +48,39 @@ echo "Defaults pwfeedback" > /etc/sudoers.d/50_feedback
 sed -i 's/NoDisplay=true/#NoDisplay=true/' /usr/share/applications/anaconda.desktop
 sed -i 's/NoDisplay=true/#NoDisplay=true/' /usr/share/applications/liveinst.desktop
 
-
 # Nvidia:  double-check we have the latest dkms driver enabled and fully installed
 dnf -y module install nvidia-driver:latest-dkms
 
+# Anaconda config: tweak default partition options
+
+cat <<'EOF' >> /etc/anaconda/conf.d/05-desktop-storage-default.conf
+# Make default storage more basic for desktop use
+# Advanced users can obviously customize if they wish
+[Storage]
+
+default_partitioning =
+    /     (min 12 GiB)
+    swap  (min 2 GiB, max 4 GiB)
+
+default_scheme = PLAIN
+
+file_system_type = ext4
+
+[Storage Constraints]
+min_partition_sizes =
+    /      12 GiB
+    /boot  2 GiB
+
+req_partition_sizes =
+    /      12 GiB
+    /boot  2 GiB
+EOF
+
+# Tweak the Anaconda /boot partition default size - may need bigger /boot to support multiple upstream kernels
+# Fun fact: /boot default is hard-coded in the python sources.  Aint Anaconda great?
+sed --in-place=".orig"  's/Size("1GiB")/Size("2GiB")/g'  /usr/lib64/python3.9/site-packages/pyanaconda/modules/storage/platform.py
+
+
 # Inside-the-ISO postinstall script
 # Anything put in /usr/shar/anaconda/post-scripts/*.ks will be run as a %post 
 # after the user installs on their system from the booted live ISO.  We need to do grub boot modification