Skip graphics modifier in CSV mode

In CSV mode the CSV files at /etc/nvidia-container-runtime/host-files-for-container.d/
should be the source of truth for container modifications. This change skips graphics
modifications to a container. This prevents conflicts when handling files such as
vulkan icd files which are already defined in the CSV file.

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

Author: elezar

internal/runtime/runtime_factory.go

@@ -84,22 +84,26 @@ func newSpecModifier(logger logger.Interface, cfg *config.Config, ociSpec oci.Sp
 		return modeModifier, nil
 	}
 
-	graphicsModifier, err := modifier.NewGraphicsModifier(logger, cfg, image, driver)
-	if err != nil {
-		return nil, err
+	modifiers := []oci.SpecModifier{modeModifier}
+	// We ignore graphics modifiers in "csv" mode.
+	if mode != "csv" {
+		graphicsModifier, err := modifier.NewGraphicsModifier(logger, cfg, image, driver)
+		if err != nil {
+			return nil, err
+		}
+		modifiers = append(modifiers, graphicsModifier)
 	}
 
 	featureModifier, err := modifier.NewFeatureGatedModifier(logger, cfg, image)
 	if err != nil {
 		return nil, err
 	}
+	modifiers = append(modifiers, featureModifier)
 
-	modifiers := modifier.Merge(
-		modeModifier,
-		graphicsModifier,
-		featureModifier,
+	m := modifier.Merge(
+		modifiers...,
 	)
-	return modifiers, nil
+	return m, nil
 }
 
 func newModeModifier(logger logger.Interface, mode string, cfg *config.Config, ociSpec oci.Spec, image image.CUDA) (oci.SpecModifier, error) {