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

[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

View File

@ -90,11 +90,6 @@ func doPrestart() {
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 != "" {
args = append(args, fmt.Sprintf("--root=%s", cli.Root))
}
@ -117,6 +112,11 @@ func doPrestart() {
}
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 != "" {
args = append(args, fmt.Sprintf("--ldconfig=%s", ldconfigPath))
}