diff options
| author | Beniamino Galvani <bgalvani@redhat.com> | 2023-08-10 11:26:50 +0200 |
|---|---|---|
| committer | Beniamino Galvani <bgalvani@redhat.com> | 2023-08-10 13:21:49 +0200 |
| commit | 995539cd30aafc8b96dd5bf946eeb453f598ce2a (patch) | |
| tree | 0c569347cd872ed873f36e043f7668bda0a35187 | |
| parent | 3f220e7dc5f17dd101db584b8b4625a49ac8d9f5 (diff) | |
contrib/rpm: enable ifcfg migration on Fedora 39+bg/rpm-migrate-ifcfg
https://fedoraproject.org/wiki/Changes/MigrateIfcfgToKeyfile
| -rw-r--r-- | contrib/fedora/rpm/NetworkManager.spec | 12 |
1 files changed, 12 insertions, 0 deletions
diff --git a/contrib/fedora/rpm/NetworkManager.spec b/contrib/fedora/rpm/NetworkManager.spec index 1361acbd7b..73f7eb641d 100644 --- a/contrib/fedora/rpm/NetworkManager.spec +++ b/contrib/fedora/rpm/NetworkManager.spec @@ -170,6 +170,12 @@ %global ifcfg_warning 0 %endif +%if 0%{?fedora} >= 39 +%global ifcfg_migrate 1 +%else +%global ifcfg_migrate 0 +%endif + %if 0%{?fedora} # Although eBPF would be available on Fedora's kernel, it seems # we often get SELinux denials (rh#1651654). But even aside them, @@ -744,6 +750,9 @@ Preferably use nmcli instead. %if %{?config_plugins_default_ifcfg_rh} -Dconfig_plugins_default=ifcfg-rh \ %endif +%if %{?ifcfg_migrate} + -Dconfig_migrate_ifcfg_rh_default=true \ +%endif -Dresolvconf=no \ -Dnetconfig=no \ -Dconfig_dns_rc_manager_default=%{dns_rc_manager_default} \ @@ -889,6 +898,9 @@ autoreconf --install --force %if %{?config_plugins_default_ifcfg_rh} --with-config-plugins-default=ifcfg-rh \ %endif +%if %{?ifcfg_migrate} + --with-config-migrate-ifcfg-rh-default=yes \ +%endif --with-resolvconf=no \ --with-netconfig=no \ --with-config-dns-rc-manager-default=%{dns_rc_manager_default} \ |