Merge branch 'rpm-fix-missing-coreutils-during-install' into 'main'

RPM spec: Avoid scriptlet failure during initial system installation

See merge request nvidia/container-toolkit/container-toolkit!432
This commit is contained in:
Evan Lezar 2023-07-05 08:43:26 +00:00 committed by Evan Lezar
parent 55df68451e
commit b07cf675ae
2 changed files with 8 additions and 3 deletions

View File

@ -1,5 +1,8 @@
# NVIDIA Container Toolkit Changelog # NVIDIA Container Toolkit Changelog
## v1.13.5
* Remove dependency on `coreutils` when installing the NVIDIA Container Toolkit on RPM-based systems.
## v1.13.4 ## v1.13.4
* [toolkit-container] Bump CUDA base image version to 12.2.0. * [toolkit-container] Bump CUDA base image version to 12.2.0.

View File

@ -57,12 +57,14 @@ mkdir -p %{buildroot}/usr/share/containers/oci/hooks.d
install -m 644 -t %{buildroot}/usr/share/containers/oci/hooks.d oci-nvidia-hook.json install -m 644 -t %{buildroot}/usr/share/containers/oci/hooks.d oci-nvidia-hook.json
%post %post
mkdir -p %{_localstatedir}/lib/rpm-state/nvidia-container-toolkit if [ $1 -gt 1 ]; then # only on package upgrade
cp -af %{_bindir}/nvidia-container-runtime-hook %{_localstatedir}/lib/rpm-state/nvidia-container-toolkit mkdir -p %{_localstatedir}/lib/rpm-state/nvidia-container-toolkit
cp -af %{_bindir}/nvidia-container-runtime-hook %{_localstatedir}/lib/rpm-state/nvidia-container-toolkit
fi
%posttrans %posttrans
if [ ! -e %{_bindir}/nvidia-container-runtime-hook ]; then if [ ! -e %{_bindir}/nvidia-container-runtime-hook ]; then
# reparing lost file nvidia-container-runtime-hook # repairing lost file nvidia-container-runtime-hook
cp -avf %{_localstatedir}/lib/rpm-state/nvidia-container-toolkit/nvidia-container-runtime-hook %{_bindir} cp -avf %{_localstatedir}/lib/rpm-state/nvidia-container-toolkit/nvidia-container-runtime-hook %{_bindir}
fi fi
rm -rf %{_localstatedir}/lib/rpm-state/nvidia-container-toolkit rm -rf %{_localstatedir}/lib/rpm-state/nvidia-container-toolkit