Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
L
lxc
Project
Overview
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Chen Yisong
lxc
Commits
9e5d932c
Unverified
Commit
9e5d932c
authored
Apr 16, 2019
by
Felix Abecassis
Committed by
Christian Brauner
Apr 19, 2019
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
hooks/nvidia: handle spaces in NVIDIA_REQUIRE variables
Previously, environment variables with a space where splitted. Signed-off-by:
Felix Abecassis
<
fabecassis@nvidia.com
>
parent
7da4e44b
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
11 deletions
+6
-11
nvidia
hooks/nvidia
+6
-11
No files found.
hooks/nvidia
View file @
9e5d932c
...
...
@@ -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
}
"
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment