Skip to content

removing blank lines from nvliblist.conf #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: nv_fix
Choose a base branch
from
Open

removing blank lines from nvliblist.conf #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 7 additions & 0 deletions etc/nvliblist.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,10 @@
#
# Copyright (c) 2017, SingularityWare, LLC. All rights reserved.
#
# This software is licensed under a 3-clause BSD license. Please
# consult LICENSE file distributed with the sources of this project regarding
# your rights to use or distribute this software.
#
# NVLIBLIST.CONF
# This configuration file determines which NVIDIA libraries to search for on
# the host system when the --nv option is invoked. You can edit it if you have
Expand Down
4 changes: 2 additions & 2 deletions libexec/cli/action_argparser.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -117,13 +117,13 @@ while true; do
-n|--nv)
shift
SINGULARITY_NVLIBLIST=$(mktemp singularity-nvliblist.XXXXXXXX)
cat $SINGULARITY_sysconfdir"/singularity/nvliblist.conf" | grep -v "^#" > $SINGULARITY_NVLIBLIST
cat $SINGULARITY_sysconfdir"/singularity/nvliblist.conf" | grep -vE "^#|^\s*$" >$SINGULARITY_NVLIBLIST
for i in $(ldconfig -p | grep -f "${SINGULARITY_NVLIBLIST}"); do
if [ -f "$i" ]; then
message 2 "Found NV library: $i\n"
if [ -z "${SINGULARITY_CONTAINLIBS:-}" ]; then
SINGULARITY_CONTAINLIBS="$i"
else
else
SINGULARITY_CONTAINLIBS="$SINGULARITY_CONTAINLIBS,$i"
fi
fi
Expand Down