From 85ad2293cb4c229658294835ad5687f54d58aca7 Mon Sep 17 00:00:00 2001
From: Skip Grube <sgrube@ciq.co>
Date: Wed, 30 Aug 2023 16:31:00 -0400
Subject: [PATCH] Various small fixes

- Added a few packages
- Fixed network DNS issue during iso creation
- Cleaned up instructions

-Skip G.
---
 NC_Rocky9_Workstation.ks       |  7 ++++---
 include/ws9_post_fixes.ks      |  9 ++++++++-
 include/ws9_repos_pkgs.ks      | 19 +++++++++++++++----
 include/ws9_stock_RockyLive.ks |  2 +-
 4 files changed, 28 insertions(+), 9 deletions(-)

diff --git a/NC_Rocky9_Workstation.ks b/NC_Rocky9_Workstation.ks
index d47dc13..14be617 100644
--- a/NC_Rocky9_Workstation.ks
+++ b/NC_Rocky9_Workstation.ks
@@ -12,10 +12,11 @@
 #
 # - sudo setenforce 0
 # - mock -r rocky-9-x86_64 --init;   mock -r rocky-9-x86_64 --install lorax-lmc-novirt vim pykickstart git
-# - ksflatten -c NC_Rocky9_Workstation.ks -o /var/lib/mock/rocky-9-x86_64/root/nc_rocky9_kickstart.ks
+# - sudo ksflatten -c NC_Rocky9_Workstation.ks -o /var/lib/mock/rocky-9-x86_64/root/nc_rocky9_kickstart.ks
 # - mock -r rocky-9-x86_64 --shell --isolation simple  --enable-network
-# - time livemedia-creator --ks /nc_rocky9_kickstart.ks   --no-virt  --resultdir /var/lmc  --project="Rocky Linux 9 No Compromises Workstation"  --make-iso  --volid Rocky9-NC  --iso-only  --iso-name Rocky9_NoCompromises-Workstation-x86_64.iso  --releasever=9  --nomacboot  --extra-boot-args  'i915.force_probe=*  rd.driver.blacklist=nouveau'  
-
+# - time livemedia-creator --ks /nc_rocky9_kickstart.ks   --no-virt  --resultdir /var/lmc  --project="Rocky Linux NC Workstation"  --make-iso  --volid Rocky9-NC  --iso-only  --iso-name Rocky9_NoCompromises-Workstation-x86_64.iso  --releasever=9  --nomacboot  --extra-boot-args  'i915.force_probe=*  rd.driver.blacklist=nouveau' --resultdir ./Rocky9_NC_iso
+#
+# Resulting iso should be in ./Rocky9_NC_iso/ , along with creation logs
 
 # Include each component separately:
 %include include/ws9_repos_pkgs.ks
diff --git a/include/ws9_post_fixes.ks b/include/ws9_post_fixes.ks
index c4d2c97..8ace48f 100644
--- a/include/ws9_post_fixes.ks
+++ b/include/ws9_post_fixes.ks
@@ -1,8 +1,12 @@
 # Fixes and tweaks to make things easier for end-users
 
 %post
+# Need DNS available, so we'll hack it up real quick:
+echo "nameserver 1.1.1.1" > /etc/resolv.conf
+
 # switch default kernel
-sed -i 's/DEFAULTKERNEL=kernel/DEFAULTKERNEL=kernel-lt/g' /etc/sysconfig/kernel
+echo -e "DEFAULTKERNEL=kernel-lt-core\nUPDATEDEFAULT=yes" > /etc/sysconfig/kernel
+#sed -i 's/DEFAULTKERNEL=kernel/DEFAULTKERNEL=kernel-lt/g' /etc/sysconfig/kernel
 
 # Enable crb and extras by default
 dnf config-manager --enable crb
@@ -46,6 +50,9 @@ grub2-mkconfig -o /boot/grub2/grub.cfg
 ${end}
 EOF
 
+# Clean up some space at the end:
+dnf -y clean all
+
 %end
 
 
diff --git a/include/ws9_repos_pkgs.ks b/include/ws9_repos_pkgs.ks
index 8a13701..d818c7a 100644
--- a/include/ws9_repos_pkgs.ks
+++ b/include/ws9_repos_pkgs.ks
@@ -47,6 +47,7 @@ kernel-lt-devel
 kernel-lt-modules
 kernel-lt-modules-extra
 kernel-headers
+kernel-lt-tools
 
 # we want to exclude the stock kernel and dependent modules:
 -kernel
@@ -56,7 +57,7 @@ kernel-headers
 -vdo
 -kmod-kvdo
 
-
+# Nvidia + gfx:
 kmod-nvidia-latest-dkms
 vulkan-tools
 glx-utils
@@ -69,14 +70,15 @@ elrepo-release
 
 # Convenience packages:
 tmux
+screen
 vim-enhanced
 nano
-gstreamer1-libav
-gstreamer1-plugins-ugly
-ffmpeg
 wget
 telnet
 netcat
+net-tools
+bash-completion
+
 
 # Office/productivity:
 libreoffice-calc
@@ -88,6 +90,15 @@ libreoffice-writer
 onlyoffice-desktopeditors
 onlyoffice-repo
 
+# Media:
+gstreamer1-libav
+gstreamer1-plugins-ugly
+ffmpeg
+vlc
+vlc-extras
+
+# Customization:
+grub-customizer
 
 memtest86+
 syslinux
diff --git a/include/ws9_stock_RockyLive.ks b/include/ws9_stock_RockyLive.ks
index 7391f51..4b1b6d8 100644
--- a/include/ws9_stock_RockyLive.ks
+++ b/include/ws9_stock_RockyLive.ks
@@ -159,7 +159,7 @@ touch /.liveimg-configured
 # https://bugzilla.redhat.com/show_bug.cgi?id=679486
 # the hostname must be something else than 'localhost'
 # https://bugzilla.redhat.com/show_bug.cgi?id=1370222
-echo "localhost-CIQ" > /etc/hostname
+echo "Rocky9-Workstation" > /etc/hostname
 
 EOF