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

Merge branch 'fix-ldconfig-update' into 'main'

Browse Source 
Fix incorrect ldconfig path

See merge request nvidia/container-toolkit/container-toolkit!505
This commit is contained in:
Evan Lezar 2023-11-24 10:49:23 +00:00
commit c014f72ffb
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmd/nvidia-ctk/hook/update-ldcache/update-ldcache.go
View File

@ -20,6 +20,7 @@ import (
"fmt" "fmt"
"os" "os"
"path/filepath" "path/filepath"
"strings"
"syscall" "syscall"
"github.com/NVIDIA/nvidia-container-toolkit/internal/config" "github.com/NVIDIA/nvidia-container-toolkit/internal/config"
@ -107,7 +108,7 @@ func (m command) run(c *cli.Context, cfg *options) error {
} }
//nolint:gosec // TODO: Can we harden this so that there is less risk of command injection //nolint:gosec // TODO: Can we harden this so that there is less risk of command injection
return syscall.Exec(args[0], args, nil) return syscall.Exec(ldconfigPath, args, nil)
} }
type root string type root string
@ -124,7 +125,7 @@ func (r root) hasPath(path string) bool {
// On systems such as Ubuntu where `/sbin/ldconfig` is a wrapper around // On systems such as Ubuntu where `/sbin/ldconfig` is a wrapper around
// /sbin/ldconfig.real, the latter is returned. // /sbin/ldconfig.real, the latter is returned.
func (m command) resolveLDConfigPath(path string) string { func (m command) resolveLDConfigPath(path string) string {
return config.NormalizeLDConfigPath("@" + path) return strings.TrimPrefix(config.NormalizeLDConfigPath("@"+path), "@")
} }
// createConfig creates (or updates) /etc/ld.so.conf.d/nvcr-<RANDOM_STRING>.conf in the container // createConfig creates (or updates) /etc/ld.so.conf.d/nvcr-<RANDOM_STRING>.conf in the container