Skip to content

fix: nvidia library resolution on merged-lib guests (e.g. Arch) #2014

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
RomeoV wants to merge 1 commit into
base: main
Choose a base branch
from
Open

fix: nvidia library resolution on merged-lib guests (e.g. Arch) #2014

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
15 changes: 13 additions & 2 deletions distrobox-init
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2106,7 +2106,8 @@ if [ "${nvidia}" -eq 1 ]; then
if [ -e "/usr/lib/x86_64-linux-gnu" ]; then
lib64_dir="/usr/lib/x86_64-linux-gnu/"
lib32_dir="/usr/lib/i386-linux-gnu/"
elif [ -e "/usr/lib64" ]; then
elif [ -e "/usr/lib64" ] && [ ! -L "/usr/lib64" ]; then
# /usr/lib64 is a real, separate directory (RPM-based guest distros)
lib64_dir="/usr/lib64/"
fi
if [ -e "/usr/lib32" ]; then
Expand All @@ -2119,7 +2120,17 @@ if [ "${nvidia}" -eq 1 ]; then
#
# /usr/lib64 is common in Arch or RPM based distros, while /usr/lib/x86_64-linux-gnu is
# common on Debian derivatives, so we need to adapt between the two nomenclatures.
NVIDIA_LIBS="$(find /run/host/usr/lib*/ -not -type d \
#
# We search lib64 before lib so that on merged-lib guests (e.g. Arch,
# where /usr/lib64 is a symlink to /usr/lib), 64-bit host libraries are
# mounted first and the "file exists" check below skips the 32-bit
# duplicates from the host's /usr/lib/.
host_lib_search_paths=""
for _hlsp in /run/host/usr/lib64 /run/host/usr/lib32 /run/host/usr/lib; do
[ -d "$_hlsp" ] && host_lib_search_paths="${host_lib_search_paths} ${_hlsp}/"
done
# shellcheck disable=SC2086
NVIDIA_LIBS="$(find ${host_lib_search_paths} -not -type d \
-iname "*lib*nvidia*.so*" \
-o -iname "*nvidia*.so*" \
-o -iname "libcuda*.so*" \
Expand Down