fix: remove conflicting nvidia initramfs files

ublue-os · Jun 28, 2024 · d0369d0 · d0369d0
1 parent 572c841
commit d0369d0
Show file tree

Hide file tree

Showing 4 changed files with 1 addition and 14 deletions.
diff --git 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
diff --git a/system_files/shared/usr/lib/modprobe.d/nvidia.conf b/system_files/shared/usr/lib/modprobe.d/nvidia.conf
diff --git a/system_files/shared/usr/lib/modprobe.d/nvk.conf b/system_files/shared/usr/lib/modprobe.d/nvk.conf