From d0369d042c3983ff68235c1f5d7386f476d1eb3a Mon Sep 17 00:00:00 2001
From: m2Giles <69128853+m2Giles@users.noreply.github.com>
Date: Fri, 28 Jun 2024 12:02:38 -0400
Subject: [PATCH] fix: remove conflicting nvidia initramfs files

---
 build_files/shared/initramfs.sh                             | 6 +-----
 .../shared/usr/lib/dracut/dracut.conf.d/95-nvidia.conf      | 1 -
 system_files/shared/usr/lib/modprobe.d/nvidia.conf          | 6 ------
 system_files/shared/usr/lib/modprobe.d/nvk.conf             | 2 --
 4 files changed, 1 insertion(+), 14 deletions(-)
 delete mode 100644 system_files/shared/usr/lib/dracut/dracut.conf.d/95-nvidia.conf
 delete mode 100644 system_files/shared/usr/lib/modprobe.d/nvidia.conf
 delete mode 100644 system_files/shared/usr/lib/modprobe.d/nvk.conf

diff --git a/build_files/shared/initramfs.sh b/build_files/shared/initramfs.sh
index c9e4a53e3d2..d9f89412801 100755
--- a/build_files/shared/initramfs.sh
+++ b/build_files/shared/initramfs.sh
@@ -3,12 +3,8 @@
 set -oue pipefail
 
 # Remove nvidia specific files
-if [[ "${IMAGE_FLAVOR}" =~ "nvidia" || ${COREOS_TYPE} =~ "nvidia" ]]; then
-  rm -f /usr/lib/modprobe.d/nvk.conf
+if [[ "${IMAGE_FLAVOR}" =~ "nvidia" || "${COREOS_TYPE}" =~ "nvidia" ]]; then
   rm -f /usr/lib/modprobe.d/amd-legacy.conf
-else
-  rm -f /usr/lib/dracut/dracut.conf.d/95-nvidia.conf
-  rm -f /usr/lib/modprobe.d/nvidia.conf
 fi
 
 if [[ "${AKMODS_FLAVOR}" == "surface" ]]; then
diff --git a/system_files/shared/usr/lib/dracut/dracut.conf.d/95-nvidia.conf b/system_files/shared/usr/lib/dracut/dracut.conf.d/95-nvidia.conf
deleted file mode 100644
index 1d74ae57913..00000000000
--- a/system_files/shared/usr/lib/dracut/dracut.conf.d/95-nvidia.conf
+++ /dev/null
@@ -1 +0,0 @@
-force_drivers+=" nvidia nvidia_modeset nvidia_uvm nvidia_drm "
diff --git a/system_files/shared/usr/lib/modprobe.d/nvidia.conf b/system_files/shared/usr/lib/modprobe.d/nvidia.conf
deleted file mode 100644
index 2335d81a370..00000000000
--- a/system_files/shared/usr/lib/modprobe.d/nvidia.conf
+++ /dev/null
@@ -1,6 +0,0 @@
-# Blacklist Nouveau
-blacklist nouveau
-options nouveau modeset=0
-
-# Enable Nvidia Modeset
-options nvidia-drm modeset=1
diff --git a/system_files/shared/usr/lib/modprobe.d/nvk.conf b/system_files/shared/usr/lib/modprobe.d/nvk.conf
deleted file mode 100644
index eea3f81798b..00000000000
--- a/system_files/shared/usr/lib/modprobe.d/nvk.conf
+++ /dev/null
@@ -1,2 +0,0 @@
-# Enable GSP firmware
-options nouveau config=NvGspRm=1