304.32304.32

5 files changed, 13 insertions, 5 deletions

diff --git a/misc.c b/misc.c
index 1f1704d..f020cac 100644
--- a/misc.c
+++ b/misc.c
@@ -2544,10 +2544,10 @@ int check_for_nouveau(Options *op)
         return FALSE;
     }
 
-    ret = ui_yes_no(op, FALSE, "For some distributions, Nouveau can be "
-                    "disabled by adding a file in the modprobe configuration "
-                    "directory.  Would you like nvidia-installer to attempt "
-                    "to create this modprobe file for you?");
+    ret = ui_yes_no(op, op->disable_nouveau, "For some distributions, Nouveau "
+                    "can be disabled by adding a file in the modprobe "
+                    "configuration directory.  Would you like nvidia-installer "
+                    "to attempt to create this modprobe file for you?");
 
     if (ret) {
         ret = blacklist_nouveau();
diff --git a/nvidia-installer.c b/nvidia-installer.c
index 3b103be..75168ea 100644
--- a/nvidia-installer.c
+++ b/nvidia-installer.c
@@ -224,6 +224,7 @@ static void parse_commandline(int argc, char *argv[], Options *op)
             op->ui_str = "none";
             break;
         case 'z': op->no_nouveau_check = TRUE; break;
+        case 'Z': op->disable_nouveau = TRUE; break;
 
         case 'k':
             op->kernel_name = strval;
diff --git a/nvidia-installer.h b/nvidia-installer.h
index 9d1c09a..cd42866 100644
--- a/nvidia-installer.h
+++ b/nvidia-installer.h
@@ -138,6 +138,7 @@ typedef struct __options {
     int no_nvidia_xconfig_question;
     int run_distro_scripts;
     int no_nouveau_check;
+    int disable_nouveau;
     int no_opengl_files;
     int no_kernel_module_source;
     int dkms;
diff --git a/option_table.h b/option_table.h
index cfdbd49..ab3b115 100644
--- a/option_table.h
+++ b/option_table.h
@@ -449,6 +449,12 @@ static const NVGetoptOption __options[] = {
       "Normally, nvidia-installer aborts installation if the nouveau kernel "
       "driver is in use.  Use this option to disable this check." },
 
+    { "disable-nouveau", 'Z', 0, NULL,
+      "If the nouveau kernel module is detected by nvidia-installer, the "
+      "installer offers to attempt to disable nouveau. The default action "
+      "is to not attempt to disable nouveau; use this option to change the "
+      "default action to attempt to disable nouveau."},
+
     { "run-nvidia-xconfig", 'X', 0, NULL,
       "nvidia-installer can optionally invoke the nvidia-xconfig utility.  "
       "This will update the system X configuration file so that the NVIDIA X "
diff --git a/version.mk b/version.mk
index ef64379..82c0323 100644
--- a/version.mk
+++ b/version.mk
@@ -1 +1 @@
-NVIDIA_VERSION = 304.30
+NVIDIA_VERSION = 304.32