switch from "rmmod" to "modprobe -r"

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

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".

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

diff --git a/src/module.c b/src/module.c
index f7b99fad5e5bfcc6106002a71313c58f15295bd0..f6d71445bfdc957a25be0dcd367a651abc7bca79 100644 (file)
--- 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
     };