From: Felix Abecassis <fabecassis@nvidia.com>
Date: Tue, 16 Apr 2019 20:58:51 +0000 (-0700)
Subject: hooks/nvidia: handle spaces in NVIDIA_REQUIRE variables
X-Git-Tag: lxc-3.2.0~100^2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=52e1d4cb49f11c4ed96dfb5d8a1fd18e6b011c72;p=thirdparty%2Flxc.git

hooks/nvidia: handle spaces in NVIDIA_REQUIRE variables

Previously, environment variables with a space where splitted.

Signed-off-by: Felix Abecassis <fabecassis@nvidia.com>
---

diff --git a/hooks/nvidia b/hooks/nvidia
index d0bdbf51e..fa943e387 100755
--- a/hooks/nvidia
+++ b/hooks/nvidia
@@ -202,12 +202,6 @@ if [ -n "${NVIDIA_DRIVER_CAPABILITIES:-}" ]; then
      CLI_CAPABILITIES="${NVIDIA_DRIVER_CAPABILITIES//,/ }"
 fi
 
-# https://github.com/nvidia/nvidia-container-runtime#nvidia_require_
-CLI_REQUIREMENTS=
-for req in $(compgen -e "NVIDIA_REQUIRE_"); do
-    CLI_REQUIREMENTS="${CLI_REQUIREMENTS} ${!req}"
-done
-
 if [ "${CLI_CAPABILITIES}" = "all" ]; then
     CLI_CAPABILITIES="compute compat32 display graphics utility video"
 fi
@@ -216,8 +210,8 @@ if [ -z "${CLI_CAPABILITIES}" ]; then
     CLI_CAPABILITIES="utility"
 fi
 
-global_args=("")
-configure_args=("")
+global_args=()
+configure_args=()
 
 if [ -n "${CLI_DEBUG}" ]; then
     echo "INFO: Writing nvidia-container-cli log at ${CLI_DEBUG}." >&2
@@ -258,9 +252,10 @@ for cap in ${CLI_CAPABILITIES}; do
     fi
 done
 
+# https://github.com/nvidia/nvidia-container-runtime#nvidia_require_
 if [ "${CLI_DISABLE_REQUIRE}" = "false" ]; then
-    for req in ${CLI_REQUIREMENTS}; do
-        configure_args+=(--require="${req}")
+    for req in $(compgen -e "NVIDIA_REQUIRE_"); do
+	configure_args+=("--require=${!req}")
     done
 fi
 
@@ -270,4 +265,4 @@ if [ -d "/sys/kernel/security/apparmor" ]; then
 fi
 
 set -x
-exec nvidia-container-cli ${global_args[@]} configure ${configure_args[@]} "${LXC_ROOTFS_MOUNT}"
+exec nvidia-container-cli ${global_args[@]} configure "${configure_args[@]}" "${LXC_ROOTFS_MOUNT}"