Miroirs/Conty
1
0
Fork 0
mirror of https://github.com/Kron4ek/Conty synced 2024-12-25 09:58:45 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Share Nvidia driver between Conty instances

Browse source 
Share Nvidia driver between all Conty instances that don't have the driver inside the filesystem image.

#140
#148 
#153
This commit is contained in:
Kron4ek 2024-08-01 14:48:51 +03:00 committed by GitHub
parent f54f0cb9de
commit c0cb1c3a94
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 39 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

69
conty-start.sh
View file

@ -22,7 +22,7 @@ if (( EUID == 0 )) && [ -z "$ALLOW_ROOT" ]; then
fi
# Conty version
script_version="1.25"
script_version="1.26"
# Important variables to manually adjust after modification!
# Needed to avoid problems with mounting due to an incorrect offset.
@ -224,7 +224,10 @@ else
fi
export overlayfs_dir="${HOME}"/.local/share/Conty/overlayfs_"${script_md5}"
export nvidia_drivers_dir="${HOME}"/.local/share/Conty/nvidia_"${script_md5}"
export nvidia_drivers_dir="${overlayfs_dir}"/nvidia
export overlayfs_shared_dir="${HOME}"/.local/share/Conty/overlayfs_shared
export nvidia_drivers_shared_dir="${overlayfs_shared_dir}"/nvidia
# Offset where the image is stored
offset=$((init_size+bash_size+script_size+busybox_size+utils_size))
@ -348,10 +351,15 @@ mount_overlayfs () {
mkdir -p "${overlayfs_dir}"/up
mkdir -p "${overlayfs_dir}"/work
mkdir -p "${overlayfs_dir}"/merged
mkdir -p "${nvidia_drivers_dir}"
if [ ! "$(ls "${overlayfs_dir}"/merged 2>/dev/null)" ]; then
if command -v "${unionfs_fuse}" 1>/dev/null; then
launch_wrapper "${unionfs_fuse}" -o relaxed_permissions,cow,noatime "${overlayfs_dir}"/up=RW:"${mount_point}"=RO "${overlayfs_dir}"/merged
if [ "${1}" = "share_nvidia" ]; then
launch_wrapper "${unionfs_fuse}" -o relaxed_permissions,cow,noatime "${overlayfs_dir}"/up=RW:"${overlayfs_shared_dir}"/up=RO:"${mount_point}"=RO "${overlayfs_dir}"/merged
else
launch_wrapper "${unionfs_fuse}" -o relaxed_permissions,cow,noatime "${overlayfs_dir}"/up=RW:"${mount_point}"=RO "${overlayfs_dir}"/merged
fi
else
echo "unionfs-fuse not found"
return 1
@ -1100,7 +1108,15 @@ if [ "$(ls "${mount_point}" 2>/dev/null)" ] || launch_wrapper "${mount_command[@
fi
if [ "${NVIDIA_HANDLER}" = 1 ]; then
if [ -f /sys/module/nvidia/version ] || lsmod | grep nvidia 1>/dev/null; then
if [ -f /sys/module/nvidia/version ]; then
unset NVIDIA_SHARED
if [ ! "$(ls "${mount_point}"/usr/lib/libGLX_nvidia.so.*.* 2>/dev/null)" ]; then
export overlayfs_dir="${overlayfs_shared_dir}"
export nvidia_drivers_dir="${nvidia_drivers_shared_dir}"
export NVIDIA_SHARED=1
fi
if [ -f "${nvidia_drivers_dir}"/lock ]; then
echo "Nvidia driver is currently installing"
echo "Please wait a moment and run Conty again"
@ -1113,31 +1129,7 @@ if [ "$(ls "${mount_point}" 2>/dev/null)" ] || launch_wrapper "${mount_command[@
unset nvidia_skip_install
unset nvidia_driver_version
if [ -f /sys/module/nvidia/version ]; then
nvidia_driver_version="$(cat /sys/module/nvidia/version)"
fi
if [ -z "${nvidia_driver_version}" ]; then
sys_lib_dirs="/usr/lib64 \
/usr/lib \
/usr/lib/x86_64-linux-gnu/nvidia/current \
/usr/lib/x86_64-linux-gnu"
for dir in ${sys_lib_dirs}; do
if [ "$(ls ${dir}/libGLX_nvidia.so.*.* 2>/dev/null)" ]; then
nvidia_driver_version="$(basename ${dir}/libGLX_nvidia.so.*.* | tail -c +18)"
break
fi
done
fi
if [ -z "${nvidia_driver_version}" ] && nvidia-smi &>/dev/null; then
nvidia_driver_version="$(nvidia-smi --query-gpu=driver_version --format=csv,noheader)"
fi
if [ -z "${nvidia_driver_version}" ] && modinfo nvidia &>/dev/null; then
nvidia_driver_version="$(modinfo -F version nvidia 2>/dev/null)"
fi
nvidia_driver_version="$(cat /sys/module/nvidia/version)"
if [ "$(ls "${mount_point}"/usr/lib/libGLX_nvidia.so.*.* 2>/dev/null)" ]; then
container_nvidia_version="$(basename "${mount_point}"/usr/lib/libGLX_nvidia.so.*.* | tail -c +18)"
@ -1175,6 +1167,23 @@ if [ "$(ls "${mount_point}" 2>/dev/null)" ] || launch_wrapper "${mount_command[@
rm -f "${nvidia_drivers_dir}"/lock
fi
if [ -n "${NVIDIA_SHARED}" ]; then
fusermount"${fuse_version}" -uz "${overlayfs_dir}"/merged 2>/dev/null || \
umount --lazy "${overlayfs_dir}"/merged 2>/dev/null
rm -f "${overlayfs_shared_dir}"/up/etc/ld.so.cache
export overlayfs_dir="${HOME}"/.local/share/Conty/overlayfs_"${script_md5}"
export nvidia_drivers_dir="${overlayfs_dir}"/nvidia
mount_overlayfs share_nvidia
if [ "$(cat "${nvidia_drivers_dir}"/ld.so.cache.nvidia 2>/dev/null)" != "${nvidia_driver_version}" ]; then
QUIET_MODE=1 RW_ROOT=1 run_bwrap ldconfig
echo "${nvidia_driver_version}" > "${nvidia_drivers_dir}"/ld.so.cache.nvidia
fi
fi
else
echo "Nvidia driver handler disabled due to unionfs errors"
unset NVIDIA_HANDLER
@ -1183,7 +1192,7 @@ if [ "$(ls "${mount_point}" 2>/dev/null)" ] || launch_wrapper "${mount_command[@
unset NVIDIA_HANDLER
fi
if [ ! -f "${nvidia_drivers_dir}"/current-nvidia-version ]; then
if [ -z "${NVIDIA_SHARED}" ] && [ ! -f "${nvidia_drivers_dir}"/current-nvidia-version ]; then
unset NVIDIA_HANDLER
fi
fi