From ac7a4a70da000ae208e8779be8b1d43cb8fe32d6 Mon Sep 17 00:00:00 2001
From: Skip Grube <sgrube@ciq.com>
Date: Sun, 25 Aug 2024 21:52:08 -0400
Subject: [PATCH] Re-factor and fixes

- Renamed include files to reflect order (better readability and easier
  modification)
- Fixed nvidia packages/driver
- Added htop
- Set selinux=permissive/logging by default
---
 NC_Rocky9_Workstation.ks                           | 14 +++++---------
 include/{ws9_repos_pkgs.ks => 010_repos_pkgs.ks}   |  1 +
 .../{ws9_base_settings.ks => 020_base_settings.ks} |  2 +-
 include/{ws9_disk.ks => 030_disk.ks}               |  0
 ...9_stock_RockyLive.ks => 040_stock_rockylive.ks} |  0
 include/{ws9_post_fixes.ks => 050_post_fixes.ks}   |  3 +++
 6 files changed, 10 insertions(+), 10 deletions(-)
 rename include/{ws9_repos_pkgs.ks => 010_repos_pkgs.ks} (99%)
 rename include/{ws9_base_settings.ks => 020_base_settings.ks} (96%)
 rename include/{ws9_disk.ks => 030_disk.ks} (100%)
 rename include/{ws9_stock_RockyLive.ks => 040_stock_rockylive.ks} (100%)
 rename include/{ws9_post_fixes.ks => 050_post_fixes.ks} (95%)

diff --git a/NC_Rocky9_Workstation.ks b/NC_Rocky9_Workstation.ks
index 14be617..e26e686 100644
--- a/NC_Rocky9_Workstation.ks
+++ b/NC_Rocky9_Workstation.ks
@@ -19,13 +19,9 @@
 # Resulting iso should be in ./Rocky9_NC_iso/ , along with creation logs
 
 # Include each component separately:
-%include include/ws9_repos_pkgs.ks
-%include include/ws9_base_settings.ks
-%include include/ws9_disk.ks
-%include include/ws9_stock_RockyLive.ks
-%include include/ws9_post_fixes.ks
-
-
-
-
+%include include/010_repos_pkgs.ks
+%include include/020_base_settings.ks
+%include include/030_disk.ks
+%include include/040_stock_rockylive.ks
+%include include/050_post_fixes.ks
 
diff --git a/include/ws9_repos_pkgs.ks b/include/010_repos_pkgs.ks
similarity index 99%
rename from include/ws9_repos_pkgs.ks
rename to include/010_repos_pkgs.ks
index 0ba684a..29396bd 100644
--- a/include/ws9_repos_pkgs.ks
+++ b/include/010_repos_pkgs.ks
@@ -84,6 +84,7 @@ net-tools
 bash-completion
 ntfsprogs
 ntfs-3g
+htop
 
 # Office/productivity:
 libreoffice-calc
diff --git a/include/ws9_base_settings.ks b/include/020_base_settings.ks
similarity index 96%
rename from include/ws9_base_settings.ks
rename to include/020_base_settings.ks
index dd9748b..269c52b 100644
--- a/include/ws9_base_settings.ks
+++ b/include/020_base_settings.ks
@@ -15,7 +15,7 @@ network  --bootproto=dhcp --device=link --activate
 # Firewall configuration
 firewall --enabled --service=mdns
 # SELinux configuration
-selinux --enforcing
+selinux --permissive
 
 # System services
 services --disabled="sshd" --enabled="NetworkManager,ModemManager"
diff --git a/include/ws9_disk.ks b/include/030_disk.ks
similarity index 100%
rename from include/ws9_disk.ks
rename to include/030_disk.ks
diff --git a/include/ws9_stock_RockyLive.ks b/include/040_stock_rockylive.ks
similarity index 100%
rename from include/ws9_stock_RockyLive.ks
rename to include/040_stock_rockylive.ks
diff --git a/include/ws9_post_fixes.ks b/include/050_post_fixes.ks
similarity index 95%
rename from include/ws9_post_fixes.ks
rename to include/050_post_fixes.ks
index c70dc1c..c53c32e 100644
--- a/include/ws9_post_fixes.ks
+++ b/include/050_post_fixes.ks
@@ -48,6 +48,9 @@ sed -i 's/NoDisplay=true/#NoDisplay=true/' /usr/share/applications/anaconda.desk
 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
+
 # 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