Align nvidia driver root envars

Align the envvars used to specify the driver root with the NVIDIA Container Toolkit (NVIDIA_DRIVER_ROOT). Signed-off-by: Evan Lezar <[email protected]>
NVIDIA · May 15, 2024 · 82db50e · 82db50e
1 parent b106e83
commit 82db50e
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/cmd/nvidia-mig-manager/main.go b/cmd/nvidia-mig-manager/main.go
@@ -47,7 +47,7 @@ const (
 	DefaultHostMigManagerStateFile   = "/etc/systemd/system/nvidia-mig-manager.service.d/override.conf"
 	DefaultHostKubeletSystemdService = "kubelet.service"
 	DefaultGPUClientsNamespace       = "default"
-	DefaultDriverRoot                = "/run/nvidia/driver"
+	DefaultNvidiaDriverRoot          = "/run/nvidia/driver"
 	DefaultDriverRootCtrPath         = "/run/nvidia/driver"
 )
 
@@ -211,11 +211,10 @@ func main() {
 		},
 		&cli.StringFlag{
 			Name:        "driver-root",
-			Aliases:     []string{"t"},
-			Value:       DefaultDriverRoot,
-			Usage:       "Root path to the NVIDIA driver installation. Only used if --cdi-enabled is set.",
+			Aliases:     []string{"nvidia-driver-root", "t"},
+			Value:       DefaultNvidiaDriverRoot,
 			Destination: &driverRoot,
-			EnvVars:     []string{"DRIVER_ROOT"},
+			EnvVars:     []string{"NVIDIA_DRIVER_ROOT", "DRIVER_ROOT"},
 		},
 		&cli.StringFlag{
 			Name:        "driver-root-ctr-path",