]> git.ipfire.org Git - thirdparty/dracut-ng.git/commitdiff
ci: remove dracut native config that is not compatible with upstream ci
authorLaszlo Gombos <laszlo.gombos@gmail.com>
Thu, 25 Jul 2024 21:09:49 +0000 (17:09 -0400)
committerNeal Gompa (ニール・ゴンパ) <ngompa13@gmail.com>
Fri, 26 Jul 2024 22:46:10 +0000 (18:46 -0400)
test/container/Dockerfile-Fedora-latest
test/container/Dockerfile-OpenSuse-latest

index 8217dbc6a86b5e6864bc4c052b19643d1a3f26c8..01e3ad20d5d2aee1c30b1e6cd780d26be70ef64d 100644 (file)
@@ -70,3 +70,9 @@ RUN dnf -y install --setopt=install_weak_deps=False \
     wget \
     xz \
     && dnf -y update && dnf clean all
+
+# discard configurations that enforce an out-of-tree dracut module
+# which would break test automation
+# since this is a distro specific change, lets do it in the container
+RUN \
+  rm -rf /usr/lib/dracut/dracut.conf.d/50-nss-softokn.conf
index 8844ab78ae1b8dfc602a63858127b6f13c50620c..51118d83b96df9c8d898e967f2e62e4cdd0edb21 100644 (file)
@@ -53,3 +53,8 @@ RUN dnf -y install --setopt=install_weak_deps=False \
     wget \
     xz \
     && dnf -y update && dnf clean all
+
+# configuration in the package is not compatible
+# with the upstream CI, lets remove it
+RUN \
+  rm -rf /usr/lib/dracut/dracut.conf.d