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

Revert "Merge pull request #703 from elezar/fix-no-persistenced-flag"

Browse Source 
This reverts commit c02b144ed4, reversing
changes made to b061446694.

Signed-off-by: Evan Lezar <elezar@nvidia.com>
This commit is contained in:
Evan Lezar 2024-09-20 20:26:00 +02:00
parent 9b72161b63
commit a819cfdab4
1 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
cmd/nvidia-container-runtime-hook/main.go
View File

@ -90,6 +90,11 @@ func doPrestart() {
args := []string{getCLIPath(cli)} args := []string{getCLIPath(cli)}
// Only include the nvidia-persistenced socket if it is explicitly enabled.
if !hook.Features.IncludePersistencedSocket.IsEnabled() {
args = append(args, "--no-persistenced")
}
if cli.Root != "" { if cli.Root != "" {
args = append(args, fmt.Sprintf("--root=%s", cli.Root)) args = append(args, fmt.Sprintf("--root=%s", cli.Root))
} }
@ -112,11 +117,6 @@ func doPrestart() {
} }
args = append(args, "configure") args = append(args, "configure")
// Only include the nvidia-persistenced socket if it is explicitly enabled.
if !hook.Features.IncludePersistencedSocket.IsEnabled() {
args = append(args, "--no-persistenced")
}
if ldconfigPath := cli.NormalizeLDConfigPath(); ldconfigPath != "" { if ldconfigPath := cli.NormalizeLDConfigPath(); ldconfigPath != "" {
args = append(args, fmt.Sprintf("--ldconfig=%s", ldconfigPath)) args = append(args, fmt.Sprintf("--ldconfig=%s", ldconfigPath))
} }