From: Jo Zzsi <jozzsicsataban@gmail.com>
Date: Thu, 7 Nov 2024 22:53:30 +0000 (-0500)
Subject: ci(fedora): remove nss-softokn workaround and install kdump-utils
X-Git-Tag: 106~255
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=330c8726e52bedbe861df0cf82960c3b938d1eb2;p=thirdparty%2Fdracut-ng.git

ci(fedora): remove nss-softokn workaround and install kdump-utils

This setup is closer what users actually use and will allow to
test more dracut modules.
---

diff --git a/test/container/Dockerfile-fedora b/test/container/Dockerfile-fedora
index 247f7979a..d9c7d502a 100644
--- a/test/container/Dockerfile-fedora
+++ b/test/container/Dockerfile-fedora
@@ -9,7 +9,7 @@
 # - openssh (ssh-client)
 # - rsyslog (syslog)
 # - libkcapi-hmaccalc (fido)
-# - nss-softokn out of tree dracut module
+# - nss-softokn, kdumpbase out of tree dracut modules
 
 ARG DISTRIBUTION=fedora
 ARG REGISTRY=registry.fedoraproject.org
@@ -54,6 +54,7 @@ RUN dnf -y install --setopt=install_weak_deps=False \
     iscsi-initiator-utils \
     jq \
     kbd \
+    kdump-utils \
     kernel \
     kmod-devel \
     libkcapi-hmaccalc \
@@ -80,16 +81,12 @@ RUN dnf -y install --setopt=install_weak_deps=False \
     tpm2-tools \
     && dnf -y update && dnf clean all
 
-# discard configurations that enforce an out-of-tree dracut module breaking CI
 # CentOS Stream ships only qemu-kvm, but it disables the KVM accel when it's not available
-RUN \
-    rm -rf /usr/lib/dracut/dracut.conf.d/50-nss-softokn.conf && \
-    [[ -e /usr/bin/qemu-kvm ]] || ln -sf /usr/libexec/qemu-kvm /usr/bin/qemu-kvm && \
-    [[ -e /usr/bin/qemu-system-$(uname -m) ]] || ln -sv /usr/libexec/qemu-kvm /usr/bin/qemu-system-$(uname -m)
-
 # force non-hostonly mode, but keep all the other config
 # this workaround is needed to pass crypt tests with rd.auto
 RUN \
 if [[ "${DISTRIBUTION}" =~ "centos:" ]]; then \
-  echo 'hostonly="no"' > /usr/lib/dracut/dracut.conf.d/02-dist.conf \
+    [[ -e /usr/bin/qemu-kvm ]] || ln -sf /usr/libexec/qemu-kvm /usr/bin/qemu-kvm ;\
+    [[ -e /usr/bin/qemu-system-$(uname -m) ]] || ln -sv /usr/libexec/qemu-kvm /usr/bin/qemu-system-$(uname -m) ;\
+    echo 'hostonly="no"' > /usr/lib/dracut/dracut.conf.d/02-dist.conf \
 ; fi