UniqAI/nvidia-container-toolkit
1
0
Fork 0
mirror of https://github.com/NVIDIA/nvidia-container-toolkit synced 2024-11-24 21:14:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Specify DRIVER_ROOT consistently

Browse Source 
This change ensures that CLI tools that require the path to the
driver root accept both the NVIDIA_DRIVER_ROOT and DRIVER_ROOT
environment variables in addition to the --driver-root command
line argument.

Signed-off-by: Evan Lezar <elezar@nvidia.com>
This commit is contained in:
Evan Lezar 2024-02-09 14:28:02 +01:00
parent e96edb3f36
commit f89cef307d
4 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/nvidia-ctk/system/create-dev-char-symlinks/create-dev-char-symlinks.go
View File

@ -87,7 +87,7 @@ func (m command) build() *cli.Command {
Usage: "The path to the driver root. `DRIVER_ROOT`/dev is searched for NVIDIA device nodes.", Usage: "The path to the driver root. `DRIVER_ROOT`/dev is searched for NVIDIA device nodes.",
Value: "/", Value: "/",
Destination: &cfg.driverRoot, Destination: &cfg.driverRoot,
EnvVars: []string{"DRIVER_ROOT"}, EnvVars: []string{"NVIDIA_DRIVER_ROOT", "DRIVER_ROOT"},
}, },
&cli.BoolFlag{ &cli.BoolFlag{
Name: "watch", Name: "watch",

2
cmd/nvidia-ctk/system/create-device-nodes/create-device-nodes.go
View File

@ -69,7 +69,7 @@ func (m command) build() *cli.Command {
Usage: "the path to the driver root. Device nodes will be created at `DRIVER_ROOT`/dev", Usage: "the path to the driver root. Device nodes will be created at `DRIVER_ROOT`/dev",
Value: "/", Value: "/",
Destination: &opts.driverRoot, Destination: &opts.driverRoot,
EnvVars: []string{"DRIVER_ROOT"}, EnvVars: []string{"NVIDIA_DRIVER_ROOT", "DRIVER_ROOT"},
}, },
&cli.BoolFlag{ &cli.BoolFlag{
Name: "control-devices", Name: "control-devices",

2
cmd/nvidia-ctk/system/print-ldcache/print-ldcache.go
View File

@ -62,7 +62,7 @@ func (m command) build() *cli.Command {
Usage: "the path to the driver root. Device nodes will be created at `DRIVER_ROOT`/dev", Usage: "the path to the driver root. Device nodes will be created at `DRIVER_ROOT`/dev",
Value: "/", Value: "/",
Destination: &opts.driverRoot, Destination: &opts.driverRoot,
EnvVars: []string{"DRIVER_ROOT"}, EnvVars: []string{"NVIDIA_DRIVER_ROOT", "DRIVER_ROOT"},
}, },
} }

5
tools/container/toolkit/toolkit.go
View File

@ -118,10 +118,11 @@ func main() {
flags := []cli.Flag{ flags := []cli.Flag{
&cli.StringFlag{ &cli.StringFlag{
Name: "nvidia-driver-root", Name: "driver-root",
Aliases: []string{"nvidia-driver-root"},
Value: DefaultNvidiaDriverRoot, Value: DefaultNvidiaDriverRoot,
Destination: &opts.DriverRoot, Destination: &opts.DriverRoot,
EnvVars: []string{"NVIDIA_DRIVER_ROOT"}, EnvVars: []string{"NVIDIA_DRIVER_ROOT", "DRIVER_ROOT"},
}, },
&cli.StringFlag{ &cli.StringFlag{
Name: "driver-root-ctr-path", Name: "driver-root-ctr-path",