Don't force specific dnf/rpm version on Fedora >= 41

It's not relevant anymore, and also Fedora 41 has DNF5 now. QubesOS/qubes-issues#9244
QubesOS · Oct 2, 2024 · 2053e75 · 2053e75
1 parent 59e1c6e
commit 2053e75
Showing 1 changed file with 5 additions and 0 deletions.
diff --git a/update/qubes-vm.sls b/update/qubes-vm.sls
@@ -6,6 +6,7 @@
         # CVE-2021-20271 mitigation
         %_pkgverify_level all
 {% else %}
+{% if grains['os'] == 'Fedora' and grains['osmajorrelease'] < 41 %}
 dnf-and-rpm:
   pkg.installed:
     - pkgs:
@@ -16,6 +17,10 @@ dnf-and-rpm:
   file.absent:
     - require:
       - pkg: dnf-and-rpm
+{% else %}
+/usr/lib/rpm/macros.d/macros.qubes:
+  file.absent: []
+{% endif %}
 {% endif %}
 {% endif %}