fix: Ensure that CUDA Compat Container path is set by default

This change ensures that the CompatContainerRoot cannot be set to the
empty string. This ensures that the default defined in the nvcdi package
is used in this case whithout requiring that the caller (the nvidia-runtime
in CDI mode or the nvidia-cdi cdi generate command). Failing to do this,
means that the CUDA compat libraries in SBSA containers are used on
Orin-based systems.

Signed-off-by: Evan Lezar <elezar@nvidia.com>

Author: elezar

pkg/nvcdi/options.go

@@ -69,9 +69,6 @@ func populateOptions(opts ...Option) *options {
 		mode:              ModeAuto,
 		driverRoot:        "/",
 		nvidiaCDIHookPath: "/usr/bin/nvidia-cdi-hook",
-		csv: csvOptions{
-			CompatContainerRoot: defaultOrinCompatContainerRoot,
-		},
 	}
 	for _, opt := range opts {
 		opt(o)
@@ -109,6 +106,10 @@ func populateOptions(opts ...Option) *options {
 		o.csv.Files = csv.DefaultFileList()
 	}
 
+	if o.mode == ModeCSV && o.csv.CompatContainerRoot == "" {
+		o.csv.CompatContainerRoot = defaultOrinCompatContainerRoot
+	}
+
 	if o.mode == ModeManagement {
 		// For management mode we explicitly disable the hooks that enable CUDA
 		// compatibility and disable device node modifications.