From 592a78a583b08a351e5267f507792004dff0cd02 Mon Sep 17 00:00:00 2001 From: Ana Cabral Date: Thu, 26 May 2022 15:23:47 -0300 Subject: [PATCH] rpm: move ifcfg scripts directory to the NetworkManager package NetworkManager does not support by default legacy ifcfg configuration files anymore, this support is now provided in a separate package (https://fedoramagazine.org/converting-networkmanager-from-ifcfg-to-keyfiles/). ifcfg directory (/etc/sysconfig/network-scripts/) should always be present, regardless of NetworkManager support for network scripts. This change makes the directory always present, not only when the recently splitted ifcfg subpackage is installed, and also make it persistent after the package removal. Fixes: 50a6627fd728 ('rpm: split ifcfg-rh settings plugin into a separate package') (cherry picked from commit 0415d904cb66da57650348205ac670c6c858f72b) (cherry picked from commit 77b48a906e87cda42655822179628cc1b2e732f7) --- contrib/fedora/rpm/NetworkManager.spec | 3 --- 1 file changed, 3 deletions(-) diff --git a/contrib/fedora/rpm/NetworkManager.spec b/contrib/fedora/rpm/NetworkManager.spec index e43a153637..e3a811ab55 100644 --- a/contrib/fedora/rpm/NetworkManager.spec +++ b/contrib/fedora/rpm/NetworkManager.spec @@ -1078,9 +1078,7 @@ fi %{_mandir}/man8/NetworkManager.8.gz %{_mandir}/man8/NetworkManager-dispatcher.8.gz %dir %{_localstatedir}/lib/NetworkManager -%if 0%{?split_ifcfg_rh} == 0 %dir %{_sysconfdir}/sysconfig/network-scripts -%endif %{_datadir}/dbus-1/system-services/org.freedesktop.nm_dispatcher.service %{_datadir}/dbus-1/system-services/org.freedesktop.nm_priv_helper.service %{_datadir}/polkit-1/actions/*.policy @@ -1210,7 +1208,6 @@ fi %if 0%{?split_ifcfg_rh} %files initscripts-ifcfg-rh -%dir %{_sysconfdir}/sysconfig/network-scripts %{nmplugindir}/libnm-settings-plugin-ifcfg-rh.so %{dbus_sys_dir}/nm-ifcfg-rh.conf %endif