[lxc-devel] [lxc/master] hooks/nvidia: handle spaces in NVIDIA_REQUIRE variables

[flx42 on Github]

A non-text attachment was scrubbed...
Name: not available
Type: text/x-mailbox
Size: 421 bytes
Desc: not available
URL: <http://lists.linuxcontainers.org/pipermail/lxc-devel/attachments/20190416/4929817e/attachment.bin>
-------------- next part --------------
From 52e1d4cb49f11c4ed96dfb5d8a1fd18e6b011c72 Mon Sep 17 00:00:00 2001
From: Felix Abecassis <fabecassis at nvidia.com>
Date: Tue, 16 Apr 2019 13:58:51 -0700
Subject: [PATCH] hooks/nvidia: handle spaces in NVIDIA_REQUIRE variables

Previously, environment variables with a space where splitted.

Signed-off-by: Felix Abecassis <fabecassis at nvidia.com>
---
 hooks/nvidia | 17 ++++++-----------
 1 file changed, 6 insertions(+), 11 deletions(-)

diff --git a/hooks/nvidia b/hooks/nvidia
index d0bdbf51e3..fa943e387a 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}"