x11-drivers/nvidia-drivers: Unload nvidia-modeset as needed (bug #566242 by Adam...

Package-Manager: portage-2.2.26

diff --git a/x11-drivers/nvidia-drivers/files/nvidia-rmmod.conf b/x11-drivers/nvidia-drivers/files/nvidia-rmmod.conf
new file mode 100644 (file)
index 0000000..48a8273
--- /dev/null
+++ b/x11-drivers/nvidia-drivers/files/nvidia-rmmod.conf
@@ -0,0 +1,3 @@
+# Nvidia UVM support
+
+remove nvidia modprobe -r --ignore-remove nvidia-modeset nvidia-uvm nvidia

diff --git a/x11-drivers/nvidia-drivers/nvidia-drivers-358.16.ebuild b/x11-drivers/nvidia-drivers/nvidia-drivers-358.16-r1.ebuild
similarity index 99%
rename from x11-drivers/nvidia-drivers/nvidia-drivers-358.16.ebuild
rename to x11-drivers/nvidia-drivers/nvidia-drivers-358.16-r1.ebuild
index 44a9162ac84925c2aae5854103f7ce289c559293..e81b1bce7b0b0f6fde4e4f140cef923dae37904d 100644 (file)
--- a/x11-drivers/nvidia-drivers/nvidia-drivers-358.16.ebuild
+++ b/x11-drivers/nvidia-drivers/nvidia-drivers-358.16-r1.ebuild
@@ -244,7 +244,7 @@ src_install() {
                # pkg_preinst, see bug #491414
                insinto /etc/modprobe.d
                newins "${FILESDIR}"/nvidia-169.07 nvidia.conf
-               use uvm && doins "${FILESDIR}"/nvidia-uvm.conf
+               doins "${FILESDIR}"/nvidia-rmmod.conf
 
                # Ensures that our device nodes are created when not using X
                exeinto "$(get_udevdir)"