From b1a006349b74880c2c28d8ec871637ab8e008ec4 Mon Sep 17 00:00:00 2001 From: seth Date: Tue, 27 Feb 2024 12:31:11 -0500 Subject: akmods: cleanup akmod error handling --- akmods/Containerfile | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/akmods/Containerfile b/akmods/Containerfile index 1fa966c..6b4a226 100644 --- a/akmods/Containerfile +++ b/akmods/Containerfile @@ -45,10 +45,8 @@ RUN rpm-ostree install \ # nvidia RUN export kernel_version="$(rpm -q kernel --queryformat '%{VERSION}-%{RELEASE}.%{ARCH}')" && \ - export akmod_version="$(basename "$(rpm -q akmod-nvidia --queryformat '%{VERSION}-%{RELEASE}')" ".fc${release%%.*}")" && \ - akmods --force --kernels "$kernel_version" --kmod nvidia && \ - if ! modinfo /usr/lib/modules/"$kernel_version"/extra/nvidia/nvidia{,-drm,-modeset,-peermem,-uvm}.ko.xz &> /dev/null; then \ - cat /var/cache/akmods/nvidia/"$akmod_version"-for-"$kernel_version".failed.log && exit 1; \ + if ! akmods --force --kernels "$kernel_version" --kmod nvidia; then \ + cat /var/cache/akmods/nvidia/*"$kernel_version".failed.log && exit 1; \ fi -- cgit v1.2.3