Add support for the --ldcache argument of nvidia-container-cli

NVIDIA · Feb 12, 2018 · 57fbead · 57fbead
1 parent 0b669a3
commit 57fbead
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 2 deletions.
diff --git a/config.toml.centos7 b/config.toml.centos7
@@ -5,5 +5,6 @@ disable-require = false
 #path = "/usr/bin/nvidia-container-cli"
 environment = []
 #debug = "/var/log/nvidia-container-runtime-hook.log"
+#ldcache = "/etc/ld.so.cache"
 load-kmods = true
 ldconfig = "@/sbin/ldconfig"
diff --git a/config.toml.stretch b/config.toml.stretch
@@ -3,7 +3,8 @@ disable-require = false
 
 [nvidia-container-cli]
 #path = "/usr/bin/nvidia-container-cli"
-#debug = "/var/log/nvidia-container-runtime-hook.log"
 environment = []
+#debug = "/var/log/nvidia-container-runtime-hook.log"
+#ldcache = "/etc/ld.so.cache"
 load-kmods = true
 ldconfig = "@/sbin/ldconfig"
diff --git a/config.toml.xenial b/config.toml.xenial
@@ -3,7 +3,8 @@ disable-require = false
 
 [nvidia-container-cli]
 #path = "/usr/bin/nvidia-container-cli"
-#debug = "/var/log/nvidia-container-runtime-hook.log"
 environment = []
+#debug = "/var/log/nvidia-container-runtime-hook.log"
+#ldcache = "/etc/ld.so.cache"
 load-kmods = true
 ldconfig = "@/sbin/ldconfig.real"
diff --git a/nvidia-container-runtime-hook/hook_config.go b/nvidia-container-runtime-hook/hook_config.go
@@ -17,6 +17,7 @@ type CLIConfig struct {
 	Path        string   `toml:"path"`
 	Environment []string `toml:"environment"`
 	Debug       *string  `toml:"debug"`
+	Ldcache     *string  `toml:"ldcache"`
 	LoadKmods   bool     `toml:"load-kmods"`
 	Ldconfig    *string  `toml:"ldconfig"`
 }
@@ -36,6 +37,7 @@ func getDefaultHookConfig() (config HookConfig) {
 			Path:        "",
 			Environment: []string{},
 			Debug:       nil,
+			Ldcache:     nil,
 			LoadKmods:   true,
 			Ldconfig:    nil,
 		},

diff --git a/nvidia-container-runtime-hook/main.go b/nvidia-container-runtime-hook/main.go
@@ -70,6 +70,9 @@ func doPrestart() {
 	} else if cli.Debug != nil {
 		args = append(args, fmt.Sprintf("--debug=%s", *cli.Debug))
 	}
+	if cli.Ldcache != nil {
+		args = append(args, fmt.Sprintf("--ldcache=%s", *cli.Ldcache))
+	}
 	args = append(args, "configure")
 
 	if cli.Ldconfig != nil {