Skip to content

Commit ff03775

Browse files
committed
Move some Nvidia binds out of the loop
1 parent 279275d commit ff03775

File tree

1 file changed

+17
-17
lines changed

1 file changed

+17
-17
lines changed

conty-start.sh

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ mount_point="${working_dir}"/mnt
4343
# a problem with mounting the image due to an incorrectly calculated offset.
4444

4545
# The size of this script
46-
scriptsize=29191
46+
scriptsize=29176
4747

4848
# The size of the utils.tar.gz archive
4949
# utils.tar.gz contains bwrap, squashfuse and dwarfs binaries
@@ -743,25 +743,25 @@ bind_nvidia_driver () {
743743
--ro-bind-try ${nvidia_drivers_dir}/nvidia-driver/32/${lib}.${nvidia_version} \
744744
/usr/lib32/${lib}.${nvidia_version_inside}"
745745
fi
746+
done
746747

747-
if [ -f "${mount_point}"/usr/lib/nvidia/xorg/libglxserver_nvidia.so.${nvidia_version_inside} ]; then
748-
nvidia_driver_bind="${nvidia_driver_bind} \
749-
--ro-bind-try ${nvidia_drivers_dir}/nvidia-driver/libglxserver_nvidia.so.${nvidia_version} \
750-
/usr/lib/nvidia/xorg/libglxserver_nvidia.so.${nvidia_version_inside}"
751-
fi
748+
if [ -f "${mount_point}"/usr/lib/nvidia/xorg/libglxserver_nvidia.so.${nvidia_version_inside} ]; then
749+
nvidia_driver_bind="${nvidia_driver_bind} \
750+
--ro-bind-try ${nvidia_drivers_dir}/nvidia-driver/libglxserver_nvidia.so.${nvidia_version} \
751+
/usr/lib/nvidia/xorg/libglxserver_nvidia.so.${nvidia_version_inside}"
752+
fi
752753

753-
if [ -f "${mount_point}"/usr/lib/vdpau/libvdpau_nvidia.so.${nvidia_version_inside} ]; then
754-
nvidia_driver_bind="${nvidia_driver_bind} \
755-
--ro-bind-try ${nvidia_drivers_dir}/nvidia-driver/libvdpau_nvidia.so.${nvidia_version} \
756-
/usr/lib/vdpau/libvdpau_nvidia.so.${nvidia_version_inside}"
757-
fi
754+
if [ -f "${mount_point}"/usr/lib/vdpau/libvdpau_nvidia.so.${nvidia_version_inside} ]; then
755+
nvidia_driver_bind="${nvidia_driver_bind} \
756+
--ro-bind-try ${nvidia_drivers_dir}/nvidia-driver/libvdpau_nvidia.so.${nvidia_version} \
757+
/usr/lib/vdpau/libvdpau_nvidia.so.${nvidia_version_inside}"
758+
fi
758759

759-
if [ -f "${mount_point}"/usr/lib32/vdpau/libvdpau_nvidia.so.${nvidia_version_inside} ]; then
760-
nvidia_driver_bind="${nvidia_driver_bind} \
761-
--ro-bind-try ${nvidia_drivers_dir}/nvidia-driver/32/libvdpau_nvidia.so.${nvidia_version} \
762-
/usr/lib32/vdpau/libvdpau_nvidia.so.${nvidia_version_inside}"
763-
fi
764-
done
760+
if [ -f "${mount_point}"/usr/lib32/vdpau/libvdpau_nvidia.so.${nvidia_version_inside} ]; then
761+
nvidia_driver_bind="${nvidia_driver_bind} \
762+
--ro-bind-try ${nvidia_drivers_dir}/nvidia-driver/32/libvdpau_nvidia.so.${nvidia_version} \
763+
/usr/lib32/vdpau/libvdpau_nvidia.so.${nvidia_version_inside}"
764+
fi
765765
fi
766766
fi
767767
fi

0 commit comments

Comments
 (0)