From 39a34b27581882b32ab634c8321f4f1302668cec Mon Sep 17 00:00:00 2001
From: Skip Grube <sgrube@ciq.com>
Date: Sun, 4 Aug 2024 16:54:33 -0400
Subject: [PATCH] Minor fixes for 9.4 update

- Added launcher script that uses KVM for easy building
- Fixed disk
- Added grub2 entries for both mbr + efi boot
- Minor package fixes and nvidia module stream fix
---
 include/ws9_disk.ks       |  4 +---
 include/ws9_post_fixes.ks |  5 ++++-
 include/ws9_repos_pkgs.ks |  9 +++++---
 mkiso.sh                  | 43 +++++++++++++++++++++++++++++++++++++++
 4 files changed, 54 insertions(+), 7 deletions(-)
 create mode 100755 mkiso.sh

diff --git a/include/ws9_disk.ks b/include/ws9_disk.ks
index ac2f616..27fddbd 100644
--- a/include/ws9_disk.ks
+++ b/include/ws9_disk.ks
@@ -5,6 +5,4 @@ zerombr
 # Partition clearing information
 clearpart --all
 # Disk partitioning information
-part /boot --fstype="ext4" --size=3000
-part / --fstype="ext4" --size=12000
-
+part / --fstype="ext4" --size=15000
diff --git a/include/ws9_post_fixes.ks b/include/ws9_post_fixes.ks
index df9cb53..c70dc1c 100644
--- a/include/ws9_post_fixes.ks
+++ b/include/ws9_post_fixes.ks
@@ -60,8 +60,11 @@ export end="%end"
 cat > /usr/share/anaconda/post-scripts/95-kernel-gfx-args.ks <<EOF
 ${post}
 # Add Intel + Nvidia tweaks to permanent boot options automatically:
-sed -i 's/quiet"/quiet i915.force_probe=* rd.driver.blacklist=nouveau"/' /etc/default/grub
+sed -i 's/quiet"/quiet i915.force_probe=* rd.driver.blacklist=nouveau nvidia_drm.modeset=0"/' /etc/default/grub
 grub2-mkconfig -o /boot/grub2/grub.cfg
+if [ -f /boot/efi/EFI/rocky/grub.cfg ]; then
+  grub2-mkconfig -o /boot/efi/EFI/rocky/grub.cfg
+fi
 ${end}
 EOF
 
diff --git a/include/ws9_repos_pkgs.ks b/include/ws9_repos_pkgs.ks
index b9b3211..0ba684a 100644
--- a/include/ws9_repos_pkgs.ks
+++ b/include/ws9_repos_pkgs.ks
@@ -17,6 +17,10 @@ repo --name="nvidia" --baseurl=https://developer.download.nvidia.com/compute/cud
 repo --name="onlyoffice" --baseurl=http://download.onlyoffice.com/repo/centos/main/noarch/ --cost=200
 
 
+# Enable nvidia latest dkms stream as default
+# (should test + switch to open-dkms later)
+module --name=nvidia-driver  --stream=latest-dkms
+
 
 # Initial package selection
 %packages
@@ -78,7 +82,8 @@ telnet
 netcat
 net-tools
 bash-completion
-
+ntfsprogs
+ntfs-3g
 
 # Office/productivity:
 libreoffice-calc
@@ -95,10 +100,8 @@ gstreamer1-libav
 gstreamer1-plugins-ugly
 ffmpeg
 vlc
-vlc-extras
 pavucontrol
 
-
 # Customization:
 grub-customizer
 gnome-tweaks
diff --git a/mkiso.sh b/mkiso.sh
new file mode 100755
index 0000000..d1cc753
--- /dev/null
+++ b/mkiso.sh
@@ -0,0 +1,43 @@
+#!/bin/bash
+
+# Build ISO image using livemedia-creator, with settings specified as variables here:
+
+IMAGE="Rocky9.4-NoCompromise-Desktop"
+
+GITDIR=$( cd -- "$( dirname -- "${BASH_SOURCE[0]}" )" &> /dev/null && pwd )
+KS="NC_Rocky9_Workstation.ks"
+
+ROCKYISO="${HOME}/Rocky-9-latest-x86_64-boot.iso"
+
+# Image build home is $HOME/gdch-build by default
+
+# Reset image build directory to clean state
+rm -f livemedia.log  program.log  virt-install.log ./temp_iso_${IMAGE}.ks
+
+# Flatten kickstart to temporary file, and swap in private CIQ mountain access key:
+ksflatten -c ${GITDIR}/${KS}  -o ./temp_iso_${IMAGE}.ks
+
+echo "Now launching build.  Connect to 127.0.0.1:5930 (VNC) to see in real-time..."
+
+# run the image creation:
+livemedia-creator  --ks ./temp_iso_${IMAGE}.ks  --project "Rocky 9 NoCompromise Desktop" \
+--volid "rocky9live" --releasever 9 \
+--make-iso --iso-only \
+--iso-name ${IMAGE}.iso \
+--iso ${ROCKYISO} \
+--vnc="vnc=127.0.0.1:30" \
+--ram 4096 --vcpus 2 \
+--extra-boot-args  'i915.force_probe=*  rd.driver.blacklist=nouveau nvidia_drm.modeset=0'
+--virt-uefi  --nomacboot \
+--resultdir ${IMAGE}
+
+#rm -f ./temp_iso_${IMAGE}.ks
+
+echo "Finished build.  Making sha256sum..."
+pushd ${IMAGE}
+sha256sum --tag ${IMAGE}.iso > ${IMAGE}.iso.sha256sum.txt
+popd
+
+echo -e "\n\nFinished ISO image creation.  ISO file can be found in $(pwd)/${IMAGE}/"
+
+