fix: remove layouts in favour or alternative config locations

These can clash with already existing directories on Classic systems
jocado · Apr 25, 2024 · 9b8e350 · 9b8e350
1 parent 16a5e8b
commit 9b8e350
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 6 deletions.
diff --git a/nvidia/lib b/nvidia/lib
@@ -77,7 +77,7 @@ nvidia_runtime_config () {
     # Default - opinionated, but most viable option for now #
     else
         rm -f "${SNAP_DATA}/etc/nvidia-container-runtime/config.toml"
-        "${SNAP}/usr/bin/nvidia-ctk" config --in-place --set nvidia-container-runtime.mode=cdi
+        "${SNAP}/usr/bin/nvidia-ctk" config --in-place --set nvidia-container-runtime.mode=cdi --set nvidia-container-runtime.modes.cdi.spec-dirs="${SNAP_DATA}/etc/cdi",/var/run/cdi --config "${SNAP_DATA}/etc/nvidia-container-runtime/config.toml"
     fi
 }
 

diff --git a/snap/snapcraft.yaml b/snap/snapcraft.yaml
@@ -43,11 +43,6 @@ passthrough:
 layout:
   /etc/docker:
     bind: $SNAP_DATA/etc/docker
-  # Container Device Interface (CDI) Support - https://docs.nvidia.com/datacenter/cloud-native/container-toolkit/install-guide.html#container-device-interface-cdi-support
-  /etc/cdi:
-    bind: $SNAP_DATA/etc/cdi
-  /etc/nvidia-container-runtime:
-    bind: $SNAP_DATA/etc/nvidia-container-runtime
   /etc/gitconfig:
     bind-file: $SNAP_DATA/etc/gitconfig
   /usr/libexec/docker/cli-plugins:
@@ -60,6 +55,8 @@ environment:
   LD_LIBRARY_PATH:    $SNAP/graphics/lib/${CRAFT_ARCH_TRIPLET}:${SNAP}/lib/:${SNAP}/lib/${CRAFT_ARCH_TRIPLET}:${SNAP}/usr/lib/:${SNAP}/usr/lib/${CRAFT_ARCH_TRIPLET}
   LIBGL_DRIVERS_PATH: $SNAP/graphics/lib/${CRAFT_ARCH_TRIPLET}/dri
   LIBVA_DRIVERS_PATH: $SNAP/graphics/lib/${CRAFT_ARCH_TRIPLET}/dri
+  # nvidia-container-runtime can only set alternative config directory via XDG_CONFIG_HOME #
+  XDG_CONFIG_HOME: $SNAP_DATA/etc
 
 plugs:
   home: