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

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

Browse Source 
[no-relnote] Move --no-persistenced flag to after configure
This commit is contained in:
Evan Lezar 2024-09-18 22:58:43 +02:00 committed by GitHub
commit c02b144ed4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
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,11 +90,6 @@ 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))
} }
@ -117,6 +112,11 @@ 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))
} }