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

Merge branch 'fix-libraries-cdi' into 'main'

Browse Source 
Fix relative link resolution for ldcache

See merge request nvidia/container-toolkit/container-toolkit!275
This commit is contained in:
Evan Lezar 2023-01-31 13:07:35 +00:00
commit 50afd443fc
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
internal/ldcache/ldcache.go
View File

@ -302,11 +302,14 @@ func (c *ldcache) resolve(target string) (string, error) {
return "", fmt.Errorf("failed to resolve symlink: %v", err) return "", fmt.Errorf("failed to resolve symlink: %v", err)
} }
if filepath.IsAbs(link) { // We return absolute paths for all targets
c.logger.Debugf("Found absolute link %v", link) if !filepath.IsAbs(link) || strings.HasPrefix(link, ".") {
link = filepath.Join(c.root, link) link = filepath.Join(filepath.Dir(target), link)
} }
// Ensure that the returned path is relative to the root.
link = filepath.Join(c.root, link)
c.logger.Debugf("Resolved link: '%v' => '%v'", name, link) c.logger.Debugf("Resolved link: '%v' => '%v'", name, link)
return link, nil return link, nil
} }