From 25a2463c23ead72bd1b049aaa6e8127a155c6249 Mon Sep 17 00:00:00 2001
From: Ben Radey <benjamin.radey+gpg@gmail.com>
Date: Sat, 4 Jul 2026 21:12:29 -0400
Subject: [PATCH] Fixing upgrade issues, upgrading server to f44

---
 Containerfile-asrock-x570                       | 2 +-
 Containerfile-lenovo-16arh7h                    | 3 ++-
 Containerfile-supermicro-x10drh                 | 7 ++++---
 Containerfile-workstation-nvidia-base           | 3 ++-
 supermicro-x10drh/nvidia-container-toolkit.repo | 5 +----
 5 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/Containerfile-asrock-x570 b/Containerfile-asrock-x570
index b7c65e0..ab49f83 100644
--- a/Containerfile-asrock-x570
+++ b/Containerfile-asrock-x570
@@ -17,5 +17,5 @@ RUN echo "%_without_kmod_nvidia_detect 1" > /etc/rpm/macros.nvidia-kmod && \
 # FIXME - remove the `--skip nonempty-run-tmp` when it's no longer needed
 RUN [[ 11 -eq $(rpm -qa gpg-pubkey* | wc -l) ]] && \
     rm -rf /var /boot && mkdir /var /boot && \
-    bootc container lint --fatal-warnings
+    bootc container lint --fatal-warnings --skip nonempty-run-tmp
 
diff --git a/Containerfile-lenovo-16arh7h b/Containerfile-lenovo-16arh7h
index 28aded8..b7007d6 100644
--- a/Containerfile-lenovo-16arh7h
+++ b/Containerfile-lenovo-16arh7h
@@ -28,7 +28,8 @@ RUN git clone https://github.com/johnfanv2/LenovoLegionLinux.git && \
 # Any more than that means that dnf automatically added a new one, which is shady!
 # Then: cleanup image for linting
 # Finally: verify image is good
+# FIXME - remove the `--skip nonempty-run-tmp` when it's no longer needed
 RUN [[ 11 -eq $(rpm -qa gpg-pubkey* | wc -l) ]] && \
     rm -rf /var /boot && mkdir /var /boot && \
-    bootc container lint --fatal-warnings
+    bootc container lint --fatal-warnings --skip nonempty-run-tmp
 
diff --git a/Containerfile-supermicro-x10drh b/Containerfile-supermicro-x10drh
index 15346f4..2771cc0 100644
--- a/Containerfile-supermicro-x10drh
+++ b/Containerfile-supermicro-x10drh
@@ -10,7 +10,7 @@ WORKDIR /gocryptfs
 RUN ./build-without-openssl.bash
 
 # ====== Stage 2: Server image ======
-FROM quay.io/fedora/fedora-silverblue:43
+FROM quay.io/fedora/fedora-silverblue:44
 
 COPY --from=builder /gocryptfs/gocryptfs /usr/bin/gocryptfs
 
@@ -24,9 +24,9 @@ RUN rpm --import \
       /keys/zrepl-rpm-pkgs \
       /keys/RPM-GPG-KEY-rpmfusion-free-fedora-2020 \
       /keys/RPM-GPG-KEY-rpmfusion-nonfree-fedora-2020 \
-      /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-43-x86_64 && \
+      /etc/pki/rpm-gpg/RPM-GPG-KEY-fedora-44-x86_64 && \
     rm -rf /keys && \
-    dnf5 install -y https://github.com/zfsonlinux/zfsonlinux.github.com/raw/master/fedora/zfs-release-3-0$(rpm --eval "%{dist}").noarch.rpm \
+    dnf5 install -y https://github.com/zfsonlinux/zfsonlinux.github.com/raw/master/fedora/zfs-release-3-1$(rpm --eval "%{dist}").noarch.rpm \
       https://mirrors.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm \
       https://mirrors.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$(rpm -E %fedora).noarch.rpm && \
     dnf5 install -y \
@@ -106,3 +106,4 @@ RUN test -f /usr/lib/sysusers.d/libvirt.conf || echo -e 'g libvirt 963' > /usr/l
 RUN [[ 7 -eq $(rpm -qa gpg-pubkey* | wc -l) ]] && \
     rm -rf /var /boot && mkdir /var /boot && \
     bootc container lint --fatal-warnings --skip nonempty-run-tmp
+
diff --git a/Containerfile-workstation-nvidia-base b/Containerfile-workstation-nvidia-base
index 56b35cf..26c561b 100644
--- a/Containerfile-workstation-nvidia-base
+++ b/Containerfile-workstation-nvidia-base
@@ -63,11 +63,12 @@ RUN rpm -q akmod-nvidia && \
 # Any more than that means that dnf automatically added a new one, which is shady!
 # Then: cleanup image for linting
 # Finally: verify image is good
+# FIXME - remove the `--skip nonempty-run-tmp` when it's no longer needed
 RUN echo "" && \
     echo "Expecting 11 keys to follow this line!" && \
     rpm -qa gpg-pubkey* && \
     echo "" && \
     [[ 11 -eq $(rpm -qa gpg-pubkey* | wc -l) ]] && \
     rm -rf /var /boot && mkdir /var /boot && \
-    bootc container lint --fatal-warnings
+    bootc container lint --fatal-warnings --skip nonempty-run-tmp
 
diff --git a/supermicro-x10drh/nvidia-container-toolkit.repo b/supermicro-x10drh/nvidia-container-toolkit.repo
index 5dcd37c..eeeb798 100644
--- a/supermicro-x10drh/nvidia-container-toolkit.repo
+++ b/supermicro-x10drh/nvidia-container-toolkit.repo
@@ -5,8 +5,6 @@ repo_gpgcheck=1
 gpgcheck=0
 enabled=1
 gpgkey=https://nvidia.github.io/libnvidia-container/gpgkey
-sslverify=1
-sslcacert=/etc/pki/tls/certs/ca-bundle.crt
 
 [nvidia-container-toolkit-experimental]
 name=nvidia-container-toolkit-experimental
@@ -15,5 +13,4 @@ repo_gpgcheck=1
 gpgcheck=0
 enabled=0
 gpgkey=https://nvidia.github.io/libnvidia-container/gpgkey
-sslverify=1
-sslcacert=/etc/pki/tls/certs/ca-bundle.crt
+