fixup! Add cuda-compat hook to allow compat libs to be discovered

Signed-off-by: Evan Lezar <[email protected]>

Author: elezar

cmd/nvidia-cdi-hook/cudacompat/cudacompat.go

@@ -116,7 +116,7 @@ func (m command) updateCUDACompatLibs(containerRoot root, cfg *options) error {
 		return nil
 	}
 
-	libs, err := containerRoot.glob(filepath.Join(cudaCompatPath, "libcuda.so.*.*"))
+	libs, err := containerRoot.globFiles(filepath.Join(cudaCompatPath, "libcuda.so.*.*"))
 	if err != nil {
 		m.logger.Warningf("Failed to find CUDA compat library: %w", err)
 		return nil
@@ -158,13 +158,34 @@ func (r root) hasPath(path string) bool {
 	return true
 }
 
-// glob matches the specified pattern in the root.
-func (r root) glob(pattern string) ([]string, error) {
+// globFiles matches the specified pattern in the root.
+// The files that match must be regular files.
+func (r root) globFiles(pattern string) ([]string, error) {
 	patternPath, err := r.resolve(pattern)
 	if err != nil {
 		return nil, err
 	}
-	return filepath.Glob(patternPath)
+	matches, err := filepath.Glob(patternPath)
+	if err != nil {
+		return nil, err
+	}
+	var files []string
+	for _, match := range matches {
+		info, err := os.Lstat(match)
+		if err != nil {
+			return nil, err
+		}
+		// Ignore symlinks.
+		if info.Mode()&os.ModeSymlink != 0 {
+			continue
+		}
+		// Ignore directories.
+		if info.IsDir() {
+			continue
+		}
+		files = append(files, match)
+	}
+	return files, nil
 }
 
 // resolve returns the absolute path including root path.