summaryrefslogtreecommitdiff
path: root/contrib
diff options
context:
space:
mode:
authorThomas Haller <thaller@redhat.com>2020-07-15 10:49:12 +0200
committerThomas Haller <thaller@redhat.com>2020-07-16 12:28:03 +0200
commit3e475e5cd17bccad2697da9979bae2fea8b619ab (patch)
treea6e69fde59ca8b143cc33bcedf0157268d0993e2 /contrib
parent26e97fcd0d4a70e32a484d3bfc57c1802da10554 (diff)
contrib/rpm: prefer keyfile settings plugin from Fedora 33 and newer
This change is for Fedora 33 and newer. For now, also enable it for RHEL 9 and newer, but it must still be decided whether that will be done there as well. https://mail.gnome.org/archives/networkmanager-list/2020-May/msg00002.html https://fedoraproject.org/wiki/Changes/NetworkManager_keyfile_instead_of_ifcfg_rh https://lists.fedoraproject.org/archives/list/devel-announce@lists.fedoraproject.org/thread/OLOU27DAON2TYGTAVZ35GZE2BEIN42U3/ https://lists.fedoraproject.org/archives/list/devel@lists.fedoraproject.org/thread/OLOU27DAON2TYGTAVZ35GZE2BEIN42U3/ https://pagure.io/fesco/issue/2432 https://bugzilla.redhat.com/show_bug.cgi?id=1857391
Diffstat (limited to 'contrib')
-rw-r--r--contrib/fedora/rpm/NetworkManager.spec4
1 files changed, 4 insertions, 0 deletions
diff --git a/contrib/fedora/rpm/NetworkManager.spec b/contrib/fedora/rpm/NetworkManager.spec
index 542b4871f5..637e71f5fb 100644
--- a/contrib/fedora/rpm/NetworkManager.spec
+++ b/contrib/fedora/rpm/NetworkManager.spec
@@ -117,7 +117,11 @@
%global dns_rc_manager_default file
%endif
+%if 0%{?rhel} > 8 || 0%{?fedora} > 32
+%global config_plugins_default keyfile,ifcfg-rh
+%else
%global config_plugins_default ifcfg-rh
+%endif
%if 0%{?fedora}
# Although eBPF would be available on Fedora's kernel, it seems