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

Build xorg lib search paths dynamically

Browse Source
This commit is contained in:
tux-rampage 2024-06-04 19:40:05 +02:00
parent 155fe66575
commit c2411e644e
No known key found for this signature in database
GPG Key ID: 8586DC2A80A7DB46
1 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
internal/discover/graphics.go
View File

@ -254,6 +254,26 @@ func optionalXorgDiscoverer(logger logger.Interface, driver *root.Driver, nvidia
return xorg return xorg
} }
func buildXOrgSearchPaths(libRoot string) []string {
paths := []string{
libRoot + "/nvidia/xorg",
}
directories := []string{"drivers", "extensions"}
pathOptions := []string{"modules", "modules/updates"}
prefixes := []string{libRoot + "/xorg", "/usr/lib/xorg", "/usr/lib64/xorg", "/usr/X11R6/lib", "/usr/X11R6/lib64"}
for _, prefix := range prefixes {
for _, pathOption := range pathOptions {
for _, directory := range directories {
paths = append(paths, prefix+"/"+pathOption+"/"+directory)
}
}
}
return paths
}
func newXorgDiscoverer(logger logger.Interface, driver *root.Driver, nvidiaCDIHookPath string) (Discover, error) { func newXorgDiscoverer(logger logger.Interface, driver *root.Driver, nvidiaCDIHookPath string) (Discover, error) {
libCudaPaths, err := cuda.New( libCudaPaths, err := cuda.New(
driver.Libraries(), driver.Libraries(),
@ -274,27 +294,7 @@ func newXorgDiscoverer(logger logger.Interface, driver *root.Driver, nvidiaCDIHo
lookup.NewFileLocator( lookup.NewFileLocator(
lookup.WithLogger(logger), lookup.WithLogger(logger),
lookup.WithRoot(driver.Root), lookup.WithRoot(driver.Root),
lookup.WithSearchPaths([]string{ lookup.WithSearchPaths(buildXOrgSearchPaths(libRoot)...),
libRoot + "/nvidia/xorg",
libRoot + "/xorg/modules/extensions",
libRoot + "/xorg/modules/drivers",
"/usr/lib/xorg/modules/extensions",
"/usr/lib/xorg/modules/drivers",
"/usr/lib64/xorg/modules/extensions",
"/usr/lib64/xorg/modules/drivers",
"/usr/lib/xorg/modules/updates/extensions",
"/usr/lib/xorg/modules/updates/drivers",
"/usr/lib64/xorg/modules/updates/extensions",
"/usr/lib64/xorg/modules/updates/drivers",
"/usr/X11R6/lib/modules/extensions",
"/usr/X11R6/lib/modules/drivers",
"/usr/X11R6/lib64/modules/extensions",
"/usr/X11R6/lib64/modules/drivers",
"/usr/X11R6/lib/modules/updates/extensions",
"/usr/X11R6/lib/modules/updates/drivers",
"/usr/X11R6/lib64/modules/updates/extensions",
"/usr/X11R6/lib64/modules/updates/drivers",
}),
lookup.WithCount(1), lookup.WithCount(1),
), ),
driver.Root, driver.Root,