From 3e475e5cd17bccad2697da9979bae2fea8b619ab Mon Sep 17 00:00:00 2001 From: Thomas Haller Date: Wed, 15 Jul 2020 10:49:12 +0200 Subject: [PATCH] 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 --- contrib/fedora/rpm/NetworkManager.spec | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/contrib/fedora/rpm/NetworkManager.spec b/contrib/fedora/rpm/NetworkManager.spec index 542b4871f..637e71f5f 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