mirror of
https://github.com/Kron4ek/Conty
synced 2024-12-26 09:58:38 +01:00
Remove the NVIDIA_FIX function
From what i heard from some people, it doesn't seem to work. Let me know if it works for you and i will revert the change.
This commit is contained in:
Kron4ek
parent
f278975237
commit
a373a53bd1
2 changed files with 10 additions and 134 deletions
16
README.md
16
README.md
|
|
@ -24,7 +24,7 @@ Besides, Conty supports true filesystem and X11 sandboxing, so you can even use
|
|||
The only requirements are **bash**, **fuse2** (or **fuse3**), **tar**, **gzip** and **coreutils**. And your /tmp directory
|
||||
should allow files execution (which it does by default on most distros).
|
||||
|
||||
Your Linux kernel must be at least version 4.4 and should support unprivileged user namespaces. On some
|
||||
Your Linux kernel must be at least version 4.4 and should support unprivileged user namespaces. On some
|
||||
Linux distros this feature is disabled by default and can be enabled with sysfs:
|
||||
|
||||
```
|
||||
|
|
@ -102,7 +102,7 @@ There are some other features, see the internal help for more information.
|
|||
## Sandbox
|
||||
|
||||
Conty uses bubblewrap and thus supports filesystem sandboxing, X11 isolation is also supported (via Xephyr). By default
|
||||
sandbox is disabled and almost all directories and files on your system are available for the container.
|
||||
sandbox is disabled and almost all directories and files on your system are available for the container.
|
||||
|
||||
Here are the environment variables that you can use to control the sandbox:
|
||||
* **SANDBOX** - enables the sandbox feature itself. Isolates all files and directories, creates a fake temporary home directory (in RAM), which is destroyed after closing the container.
|
||||
|
|
@ -137,14 +137,9 @@ Nvidia users with the proprietary driver will experience graphics acceleration p
|
|||
|
||||
For example, if the version of your Nvidia kernel module is 460.56 and the libraries inside the container are from 460.67 version, then graphics acceleration will not work.
|
||||
|
||||
There is an experimental solution for this problem that can be enabled with the **NVIDIA_FIX** variable. I don't have a Nvidia GPU to test this function properly, so it might or might not work.
|
||||
|
||||
```
|
||||
export NVIDIA_FIX=1
|
||||
./conty.sh glxgears
|
||||
```
|
||||
|
||||
Another and more reliable solution is to install the same driver version as included inside Conty, which is usually the latest non-beta version. You can see the exact driver version in pkg_list.txt attached to each Conty release.
|
||||
There are two solutions for this problem:
|
||||
* The first and probably the easiest solution is to install the same driver version as included inside Conty, which is usually the latest non-beta version. You can see the exact driver version in pkg_list.txt attached to each Conty release.
|
||||
* The second solution is to (re)build Conty and include the same driver version as installed on your system.
|
||||
|
||||
## How to update
|
||||
|
||||
|
|
@ -179,3 +174,4 @@ For the sake of convenience, there are compiled binaries (**utils.tar.gz**) of b
|
|||
* [squashfuse](https://github.com/vasi/squashfuse)
|
||||
* [dwarfs](https://github.com/mhx/dwarfs)
|
||||
* [archlinux](https://archlinux.org/)
|
||||
* [chaotic-aur](https://aur.chaotic.cx/)
|
||||
|
|
|
|||
128
conty-start.sh
128
conty-start.sh
|
|
@ -43,7 +43,7 @@ mount_point="${working_dir}"/mnt
|
|||
# a problem with mounting the image due to an incorrectly calculated offset.
|
||||
|
||||
# The size of this script
|
||||
scriptsize=29829
|
||||
scriptsize=24812
|
||||
|
||||
# The size of the utils archive
|
||||
utilssize=2928770
|
||||
|
|
@ -117,10 +117,6 @@ if [ "$1" = "--help" ] || [ "$1" = "-h" ] || ([ -z "$1" ] && [ ! -L "${script_li
|
|||
echo -e "\t\tused for it."
|
||||
echo -e "USE_SYS_UTILS \tMakes the script to use squashfuse/dwarfs and bwrap"
|
||||
echo -e "\t\tinstalled on the system instead of the builtin ones."
|
||||
echo -e "NVIDIA_FIX \tFixes graphics acceleration problems on Nvidia GPUs with the"
|
||||
echo -e "\t\tproprietary driver. This is not needed for the free/oss Nouveau"
|
||||
echo -e "\t\tdriver. Enable this only if you have graphics acceleration"
|
||||
echo -e "\t\tproblems on Nvidia."
|
||||
echo -e "SUDO_MOUNT \tMakes the script to mount the squashfs image by using"
|
||||
echo -e "\t\tthe regular mount command instead of squashfuse. In this"
|
||||
echo -e "\t\tcase root rights will be requested (via sudo) when mounting"
|
||||
|
|
@ -158,6 +154,9 @@ if [ "$1" = "--help" ] || [ "$1" = "-h" ] || ([ -z "$1" ] && [ ! -L "${script_li
|
|||
echo "To remove: ./conty.sh -u -pkgname1 -pkgname2 -pkgname3"
|
||||
echo "In this case Conty will update all packages and will additionally"
|
||||
echo "install and/or remove specified packages."
|
||||
echo
|
||||
echo "If you are using an Nvidia GPU, please read the information"
|
||||
echo "here: https://github.com/Kron4ek/Conty#known-issues"
|
||||
exit
|
||||
elif [ "$1" = "-v" ]; then
|
||||
echo "${script_version}"
|
||||
|
|
@ -404,7 +403,6 @@ if [ "$1" = "-u" ] || [ "$1" = "-U" ]; then
|
|||
|
||||
# Since Conty is used here to update itself, it's necessary to disable
|
||||
# some environment variables for this to work properly
|
||||
unset NVIDIA_FIX
|
||||
unset DISABLE_NET
|
||||
unset HOME_DIR
|
||||
unset BIND
|
||||
|
|
@ -661,125 +659,11 @@ run_bwrap () {
|
|||
${custom_home} \
|
||||
${bind_items} \
|
||||
${unshare_net} \
|
||||
${nvidia_driver_bind} \
|
||||
--ro-bind-try "${XAUTHORITY}" "${XAUTHORITY}" \
|
||||
--setenv PATH "${CUSTOM_PATH}" \
|
||||
"$@"
|
||||
}
|
||||
|
||||
# A function that checks if the Nvidia kernel module loaded in the
|
||||
# system matches the version of the Nvidia libraries inside the container
|
||||
# and downloads corresponding Nvidia libs from the official site if they
|
||||
# are not the same. Also binds the downloaded libraries to the container.
|
||||
|
||||
bind_nvidia_driver () {
|
||||
# Path to store downloaded Nvidia drivers
|
||||
nvidia_drivers_dir="${HOME}"/.local/share/Conty/nvidia-drivers
|
||||
|
||||
# Check if the Nvidia module is loaded
|
||||
# If it's loaded, then likely Nvidia GPU is being used
|
||||
if lsmod | grep nvidia 1>/dev/null || nvidia-smi 1>/dev/null; then
|
||||
if nvidia-smi 1>/dev/null; then
|
||||
nvidia_version="$(nvidia-smi --query-gpu=driver_version --format=csv,noheader)"
|
||||
elif modinfo nvidia &>/dev/null; then
|
||||
nvidia_version="$(modinfo -F version nvidia 2>/dev/null)"
|
||||
else
|
||||
if [ -d /usr/lib/x86_64-linux-gnu ]; then
|
||||
nvidia_version="$(basename /usr/lib/x86_64-linux-gnu/libGLX_nvidia.so.*.* | tail -c +18)"
|
||||
else
|
||||
nvidia_version="$(basename /usr/lib/libGLX_nvidia.so.*.* | tail -c +18)"
|
||||
fi
|
||||
fi
|
||||
|
||||
# Check if the kernel module version is different from the
|
||||
# libraries version inside the container
|
||||
if [ -n "${nvidia_version}" ]; then
|
||||
nvidia_version_inside="$(basename "${mount_point}"/usr/lib/libGLX_nvidia.so.*.* | tail -c +18)"
|
||||
|
||||
if [ "$(cat "${nvidia_drivers_dir}"/current_version.txt 2>/dev/null)" != "${nvidia_version}" ] \
|
||||
&& [ "${nvidia_version}" != "${nvidia_version_inside}" ]; then
|
||||
echo "Nvidia driver version mismatch detected, trying to fix"
|
||||
|
||||
OLD_PWD="${PWD}"
|
||||
|
||||
mkdir -p "${nvidia_drivers_dir}"
|
||||
cd "${nvidia_drivers_dir}"
|
||||
|
||||
rm -rf nvidia-driver
|
||||
rm -f nvidia.run
|
||||
|
||||
echo "Downloading Nvidia ${nvidia_version}, please wait"
|
||||
|
||||
# Try to download from the default Nvidia url
|
||||
driver_url="https://us.download.nvidia.com/XFree86/Linux-x86_64/${nvidia_version}/NVIDIA-Linux-x86_64-${nvidia_version}.run"
|
||||
wget -q --show-progress "${driver_url}" -O nvidia.run
|
||||
|
||||
# If the previous download failed, get url from flathub
|
||||
if [ ! -s nvidia.run ]; then
|
||||
rm -f nvidia.run
|
||||
driver_url="https:$(wget -q "https://raw.githubusercontent.com/flathub/org.freedesktop.Platform.GL.nvidia/master/data/nvidia-${nvidia_version}-i386.data" \
|
||||
-O - | cut -d ':' -f 6)"
|
||||
|
||||
wget -q --show-progress "${driver_url}" -O nvidia.run
|
||||
fi
|
||||
|
||||
if [ -s nvidia.run ]; then
|
||||
chmod +x nvidia.run
|
||||
echo "Unpacking nvidia.run..."
|
||||
./nvidia.run -x &>/dev/null
|
||||
rm nvidia.run
|
||||
mv NVIDIA-Linux-x86_64-${nvidia_version} nvidia-driver
|
||||
echo ${nvidia_version} > current_version.txt
|
||||
fi
|
||||
|
||||
cd "${OLD_PWD}"
|
||||
fi
|
||||
|
||||
# Bind the downloaded Nvidia libs to the container
|
||||
if [ -d "${nvidia_drivers_dir}"/nvidia-driver ]; then
|
||||
nvidia_libs_list="libcuda.so libEGL_nvidia.so libGLESv1_CM_nvidia.so \
|
||||
libGLESv2_nvidia.so libGLX_nvidia.so libnvcuvid.so libnvidia-cbl.so \
|
||||
libnvidia-cfg.so libnvidia-eglcore.so libnvidia-encode.so libnvidia-fbc.so \
|
||||
libnvidia-glcore.so libnvidia-glsi.so libnvidia-glvkspirv.so libnvidia-ifr.so \
|
||||
libnvidia-ml.so libnvidia-ngx.so libnvidia-opticalflow.so libnvidia-ptxjitcompiler.so \
|
||||
libnvidia-rtcore.so libnvidia-tls.so libnvoptix.so"
|
||||
|
||||
for lib in ${nvidia_libs_list}; do
|
||||
if [ -f "${mount_point}"/usr/lib/${lib}.${nvidia_version_inside} ]; then
|
||||
nvidia_driver_bind="${nvidia_driver_bind} \
|
||||
--ro-bind-try ${nvidia_drivers_dir}/nvidia-driver/${lib}.${nvidia_version} \
|
||||
/usr/lib/${lib}.${nvidia_version_inside}"
|
||||
fi
|
||||
|
||||
if [ -f "${mount_point}"/usr/lib32/${lib}.${nvidia_version_inside} ]; then
|
||||
nvidia_driver_bind="${nvidia_driver_bind} \
|
||||
--ro-bind-try ${nvidia_drivers_dir}/nvidia-driver/32/${lib}.${nvidia_version} \
|
||||
/usr/lib32/${lib}.${nvidia_version_inside}"
|
||||
fi
|
||||
done
|
||||
|
||||
if [ -f "${mount_point}"/usr/lib/nvidia/xorg/libglxserver_nvidia.so.${nvidia_version_inside} ]; then
|
||||
nvidia_driver_bind="${nvidia_driver_bind} \
|
||||
--ro-bind-try ${nvidia_drivers_dir}/nvidia-driver/libglxserver_nvidia.so.${nvidia_version} \
|
||||
/usr/lib/nvidia/xorg/libglxserver_nvidia.so.${nvidia_version_inside}"
|
||||
fi
|
||||
|
||||
if [ -f "${mount_point}"/usr/lib/vdpau/libvdpau_nvidia.so.${nvidia_version_inside} ]; then
|
||||
nvidia_driver_bind="${nvidia_driver_bind} \
|
||||
--ro-bind-try ${nvidia_drivers_dir}/nvidia-driver/libvdpau_nvidia.so.${nvidia_version} \
|
||||
/usr/lib/vdpau/libvdpau_nvidia.so.${nvidia_version_inside}"
|
||||
fi
|
||||
|
||||
if [ -f "${mount_point}"/usr/lib32/vdpau/libvdpau_nvidia.so.${nvidia_version_inside} ]; then
|
||||
nvidia_driver_bind="${nvidia_driver_bind} \
|
||||
--ro-bind-try ${nvidia_drivers_dir}/nvidia-driver/32/libvdpau_nvidia.so.${nvidia_version} \
|
||||
/usr/lib32/vdpau/libvdpau_nvidia.so.${nvidia_version_inside}"
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
fi
|
||||
}
|
||||
|
||||
trap_exit () {
|
||||
rm -f "${working_dir}"/running_"${script_id}"
|
||||
|
||||
|
|
@ -843,10 +727,6 @@ if [ "$(ls "${mount_point}" 2>/dev/null)" ] || \
|
|||
|
||||
show_msg "Running Conty"
|
||||
|
||||
if [ "${NVIDIA_FIX}" = 1 ]; then
|
||||
bind_nvidia_driver
|
||||
fi
|
||||
|
||||
export CUSTOM_PATH="/bin:/sbin:/usr/bin:/usr/sbin:/usr/lib/jvm/default/bin:/usr/local/bin:/usr/local/sbin:${PATH}"
|
||||
|
||||
if [ "$1" = "-l" ]; then
|
||||
|
|
|
|||
Loading…
Reference in a new issue