fdo-mirrors/NetworkManager
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/NetworkManager/NetworkManager.git synced 2026-05-08 11:19:16 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

contrib/rpm: enable ifcfg migration on Fedora 39+

Browse source 
https://fedoraproject.org/wiki/Changes/MigrateIfcfgToKeyfile
(cherry picked from commit 995539cd30)
This commit is contained in:
Beniamino Galvani 2023-08-10 11:26:50 +02:00 • committed by Thomas Haller
parent 54908e0ec2
commit e942c4129e
No known key found for this signature in database
GPG key ID: 29C2366E4DFC5728
1 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
contrib/fedora/rpm/NetworkManager.spec
View file

@ -170,6 +170,12 @@
%global ifcfg_warning 0 %global ifcfg_warning 0
%endif %endif
%if 0%{?fedora} >= 39
%global ifcfg_migrate 1
%else
%global ifcfg_migrate 0
%endif
%if 0%{?fedora} %if 0%{?fedora}
# Although eBPF would be available on Fedora's kernel, it seems # Although eBPF would be available on Fedora's kernel, it seems
# we often get SELinux denials (rh#1651654). But even aside them, # we often get SELinux denials (rh#1651654). But even aside them,
@ -744,6 +750,9 @@ Preferably use nmcli instead.
-Ddist_version=%{version}-%{release} \ -Ddist_version=%{version}-%{release} \
%if %{?config_plugins_default_ifcfg_rh} %if %{?config_plugins_default_ifcfg_rh}
-Dconfig_plugins_default=ifcfg-rh \ -Dconfig_plugins_default=ifcfg-rh \
%endif
%if %{?ifcfg_migrate}
-Dconfig_migrate_ifcfg_rh_default=true \
%endif %endif
-Dresolvconf=no \ -Dresolvconf=no \
-Dnetconfig=no \ -Dnetconfig=no \
@ -889,6 +898,9 @@ autoreconf --install --force
--with-dist-version=%{version}-%{release} \ --with-dist-version=%{version}-%{release} \
%if %{?config_plugins_default_ifcfg_rh} %if %{?config_plugins_default_ifcfg_rh}
--with-config-plugins-default=ifcfg-rh \ --with-config-plugins-default=ifcfg-rh \
%endif
%if %{?ifcfg_migrate}
--with-config-migrate-ifcfg-rh-default=yes \
%endif %endif
--with-resolvconf=no \ --with-resolvconf=no \
--with-netconfig=no \ --with-netconfig=no \