319.12319.12

1 files changed, 57 insertions, 0 deletions

diff --git a/option_table.h b/option_table.h
index ab3b115..a5854ae 100644
--- a/option_table.h
+++ b/option_table.h
@@ -47,6 +47,7 @@ enum {
     HELP_ARGS_ONLY_OPTION,
     TMPDIR_OPTION,
     OPENGL_HEADERS_OPTION,
+    NO_NVIDIA_MODPROBE_OPTION,
     INSTALLER_PREFIX_OPTION,
     FORCE_TLS_OPTION,
     SANITY_OPTION,
@@ -74,6 +75,7 @@ enum {
     NO_SIGWINCH_WORKAROUND_OPTION,
     X_MODULE_PATH_OPTION,
     DOCUMENTATION_PREFIX_OPTION,
+    APPLICATION_PROFILE_PATH_OPTION,
     X_LIBRARY_PATH_OPTION,
     NO_KERNEL_MODULE_OPTION,
     NO_X_CHECK_OPTION,
@@ -84,6 +86,11 @@ enum {
     KERNEL_MODULE_SOURCE_DIR_OPTION,
     NO_KERNEL_MODULE_SOURCE_OPTION,
     DKMS_OPTION,
+    MODULE_SIGNING_SECRET_KEY_OPTION,
+    MODULE_SIGNING_PUBLIC_KEY_OPTION,
+    MODULE_SIGNING_SCRIPT_OPTION,
+    MODULE_SIGNING_KEY_PATH_OPTION,
+    MODULE_SIGNING_HASH_OPTION
 };
 
 static const NVGetoptOption __options[] = {
@@ -247,6 +254,12 @@ static const NVGetoptOption __options[] = {
       "driver will be installed.  The default is: '"
       DEFAULT_DOCUMENTATION_PREFIX "'." },
 
+    { "application-profile-path", APPLICATION_PROFILE_PATH_OPTION,
+        NVGETOPT_STRING_ARGUMENT, NULL,
+        "The directory under which default application profiles for the NVIDIA "
+        "driver will be installed. The default is: '"
+        DEFAULT_APPLICATION_PROFILE_PATH "'." },
+
     { "kernel-include-path", KERNEL_INCLUDE_PATH_OPTION,
       NVGETOPT_STRING_ARGUMENT, NULL,
       "The directory containing the kernel include files that "
@@ -338,6 +351,16 @@ static const NVGetoptOption __options[] = {
       "a glx.h or gl.h.  Until that is resolved, NVIDIA's OpenGL "
       "header files can still be chosen, through this installer option." },
 
+    { "no-nvidia-modprobe", NO_NVIDIA_MODPROBE_OPTION, 0, NULL,
+      "Skip installation of 'nvidia-modprobe', a setuid root utility which "
+      "nvidia-installer installs by default.  nvidia-modprobe can be used by "
+      "user-space NVIDIA driver components to load the NVIDIA kernel module, "
+      "and create the NVIDIA device files, when those components run without "
+      "sufficient privileges to do so on their own, e.g., the CUDA driver run "
+      "within the permissions of a non-privileged user.  This utility is only "
+      "needed if other means of loading the NVIDIA kernel module and creating "
+      "the NVIDIA device files are unavailable." },
+
     { "force-tls", FORCE_TLS_OPTION, NVGETOPT_STRING_ARGUMENT, NULL,
       "NVIDIA's OpenGL libraries are compiled with one of two "
       "different thread local storage (TLS) mechanisms: 'classic tls' "
@@ -539,6 +562,40 @@ static const NVGetoptOption __options[] = {
       "'--no-questions' or '--silent' options, which assume the default "
       "values for all questions." },
 
+    { "module-signing-secret-key", MODULE_SIGNING_SECRET_KEY_OPTION, 
+      NVGETOPT_STRING_ARGUMENT, NULL,
+      "Specify a path to a private key to use for signing the NVIDIA kernel "
+      "module. The corresponding public key must also be provided." },
+
+    { "module-signing-public-key", MODULE_SIGNING_PUBLIC_KEY_OPTION, 
+      NVGETOPT_STRING_ARGUMENT, NULL,
+      "Specify a path to a public key to use for verifying the signature of "
+      "the NVIDIA kernel module. The corresponding private key must also be "
+      "provided." },
+
+    { "module-signing-script", MODULE_SIGNING_SCRIPT_OPTION,
+      NVGETOPT_STRING_ARGUMENT, NULL,
+      "Specify a path to a program to use for signing the NVIDIA kernel "
+      "module. The program will be called with the arguments: program-name "
+      "<HASH> <PRIVATEKEY> <PUBLICKEY> <MODULE>; if the program returns an "
+      "error status, it will be called again with the arguments: program-name "
+      "<PRIVATEKEY> <PUBLICKEY> <MODULE>. Default: use the \"sign-file\" "
+      "script in the kernel source directory." },
+
+    { "module-signing-key-path", MODULE_SIGNING_KEY_PATH_OPTION,
+      NVGETOPT_STRING_ARGUMENT, NULL,
+      "Specify a path where signing keys generated by nvidia-installer will "
+      "be installed. Default: install keys to '" DEFAULT_MODULE_SIGNING_KEY_PATH
+      "'." },
+
+    { "module-signing-hash", MODULE_SIGNING_HASH_OPTION,
+      NVGETOPT_STRING_ARGUMENT, NULL,
+      "Specify a cryptographic hash algorithm to use for signing kernel "
+      "modules. This requires a module signing tool that allows explicit "
+      "selection of the hash algorithm, and the hash algorithm name must "
+      "be recognizable by the module signing tool. Default: select a hash "
+      "algorithm automatically, based on the kernel's configuration." },
+
     /* Orphaned options: These options were in the long_options table in
      * nvidia-installer.c but not in the help. */
     { "debug",                    'd', 0, NULL,NULL },