Skip to content

Commit 4240d5b

Browse files
author
billy
committed
fix: improve formatting for NVIDIA ICD and EGL vendor files
1 parent c93cc31 commit 4240d5b

1 file changed

Lines changed: 17 additions & 13 deletions

File tree

  • root/etc/s6-overlay/s6-rc.d/init-video

root/etc/s6-overlay/s6-rc.d/init-video/run

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -55,13 +55,15 @@ if which nvidia-smi >/dev/null 2>&1; then
5555
# get vulkan api version
5656
VULKAN_API_VERSION=$(ldconfig -p | grep "libvulkan.so" | awk '{print $NF}' | xargs readlink | grep -oE "[0-9]+\.[0-9]+\.[0-9]+")
5757
mkdir -pm755 /etc/vulkan/icd.d/
58-
echo "{\n\
59-
\"file_format_version\" : \"1.0.0\",\n\
60-
\"ICD\": {\n\
61-
\"library_path\": \"libGLX_nvidia.so.0\",\n\
62-
\"api_version\" : \"${VULKAN_API_VERSION}\"\n\
63-
}\n\
64-
}" > /etc/vulkan/icd.d/nvidia_icd.json
58+
cat > /etc/vulkan/icd.d/nvidia_icd.json << EOF
59+
{
60+
"file_format_version" : "1.0.0",
61+
"ICD": {
62+
"library_path": "libGLX_nvidia.so.0",
63+
"api_version" : "${VULKAN_API_VERSION}"
64+
}
65+
}
66+
EOF
6567
fi
6668

6769
# find glvnd egl_vendor files
@@ -70,11 +72,13 @@ if which nvidia-smi >/dev/null 2>&1; then
7072
if [ -z "${EGLS}" ]; then
7173
echo "**** Setting up EGL vendor file for NVIDIA ****"
7274
mkdir -pm755 /etc/glvnd/egl_vendor.d/
73-
echo "{\n\
74-
\"file_format_version\" : \"1.0.0\",\n\
75-
\"ICD\": {\n\
76-
\"library_path\": \"libEGL_nvidia.so.0\"\n\
77-
}\n\
78-
}" > /etc/glvnd/egl_vendor.d/10_nvidia.json
75+
cat > /etc/glvnd/egl_vendor.d/10_nvidia.json << EOF
76+
{
77+
"file_format_version" : "1.0.0",
78+
"ICD": {
79+
"library_path": "libEGL_nvidia.so.0"
80+
}
81+
}
82+
EOF
7983
fi
8084
fi

0 commit comments

Comments
 (0)