Unverified Commit 9e5d932c by Felix Abecassis Committed by Christian Brauner

hooks/nvidia: handle spaces in NVIDIA_REQUIRE variables

Previously, environment variables with a space where splitted. Signed-off-by: 's avatarFelix Abecassis <fabecassis@nvidia.com>
parent 7da4e44b
...@@ -202,12 +202,6 @@ if [ -n "${NVIDIA_DRIVER_CAPABILITIES:-}" ]; then ...@@ -202,12 +202,6 @@ if [ -n "${NVIDIA_DRIVER_CAPABILITIES:-}" ]; then
CLI_CAPABILITIES="${NVIDIA_DRIVER_CAPABILITIES//,/ }" CLI_CAPABILITIES="${NVIDIA_DRIVER_CAPABILITIES//,/ }"
fi 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 if [ "${CLI_CAPABILITIES}" = "all" ]; then
CLI_CAPABILITIES="compute compat32 display graphics utility video" CLI_CAPABILITIES="compute compat32 display graphics utility video"
fi fi
...@@ -216,8 +210,8 @@ if [ -z "${CLI_CAPABILITIES}" ]; then ...@@ -216,8 +210,8 @@ if [ -z "${CLI_CAPABILITIES}" ]; then
CLI_CAPABILITIES="utility" CLI_CAPABILITIES="utility"
fi fi
global_args=("") global_args=()
configure_args=("") configure_args=()
if [ -n "${CLI_DEBUG}" ]; then if [ -n "${CLI_DEBUG}" ]; then
echo "INFO: Writing nvidia-container-cli log at ${CLI_DEBUG}." >&2 echo "INFO: Writing nvidia-container-cli log at ${CLI_DEBUG}." >&2
...@@ -258,9 +252,10 @@ for cap in ${CLI_CAPABILITIES}; do ...@@ -258,9 +252,10 @@ for cap in ${CLI_CAPABILITIES}; do
fi fi
done done
# https://github.com/nvidia/nvidia-container-runtime#nvidia_require_
if [ "${CLI_DISABLE_REQUIRE}" = "false" ]; then if [ "${CLI_DISABLE_REQUIRE}" = "false" ]; then
for req in ${CLI_REQUIREMENTS}; do for req in $(compgen -e "NVIDIA_REQUIRE_"); do
configure_args+=(--require="${req}") configure_args+=("--require=${!req}")
done done
fi fi
...@@ -270,4 +265,4 @@ if [ -d "/sys/kernel/security/apparmor" ]; then ...@@ -270,4 +265,4 @@ if [ -d "/sys/kernel/security/apparmor" ]; then
fi fi
set -x 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}"
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment