mirror of
https://github.com/NVIDIA/nvidia-container-toolkit
synced 2024-11-24 21:14:00 +00:00
[no-relnote] Move --no-persistenced flag to after configure
Signed-off-by: Evan Lezar <elezar@nvidia.com>
This commit is contained in:
parent
b061446694
commit
16fdef50e6
@ -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))
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user