From: Debian NVIDIA Maintainers <pkg-nvidia-devel@lists.alioth.debian.org>
Date: Tue, 24 Jan 2017 14:20:27 +0000 (+0000)
Subject: With the introduction of nvidia-uvm module, unloading nvidia module will fail unless... 
X-Git-Tag: archive/raspbian/3.2.1-26+rpi1~1^2^2^2~6
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=647ced8c8d6d796f30c9354ad040116cf208377a;p=bumblebee.git

With the introduction of nvidia-uvm module, unloading nvidia module will fail unless nvidia-uvm is unloaded.  GH-565 suggests using "remove" or "softdep" modprobe.d clauses to teach modprobe to handle that for us; "rmmod" does not have that functionality, so switch to "modprobe -r".

Origin: upstream, https://github.com/Bumblebee-Project/Bumblebee/commit/1ada79fe5916961fc4e4917f8c63bb184908d986
Bug: https://github.com/Bumblebee-Project/Bumblebee/issues/565
Bug-Debian: 793389


Gbp-Pq: Name modprobe-r-instead-of-rmmod.patch
---

diff --git a/src/module.c b/src/module.c
index f7b99fa..f6d7144 100644
--- a/src/module.c
+++ b/src/module.c
@@ -96,7 +96,8 @@ int module_unload(char *driver) {
     int retries = 30;
     bb_log(LOG_INFO, "Unloading %s driver\n", driver);
     char *mod_argv[] = {
-      "rmmod",
+      "modprobe",
+      "-r",
       driver,
       NULL
     };