diff options
| author | Thomas Haller <thaller@redhat.com> | 2015-06-09 19:27:55 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2015-07-02 16:01:20 +0200 |
| commit | 6f0036151f464921a62d15c03cd9aa0f213e6200 (patch) | |
| tree | 80e3125f207f64c4dcf2af46e5191998becd7fdd /contrib/fedora/rpm/NetworkManager.spec | |
| parent | 98dd29e4ae79e08e2f6b0e607f3cdb8af564daa1 (diff) | |
| download | NetworkManager-6f0036151f464921a62d15c03cd9aa0f213e6200.tar.gz | |
settings: enable "ibft" plugin by default together with "ifcfg-rh"
Originally, ibft settings were handled by "ifcfg-rh" plugin. Later, we added
a separate "ibft" plugin and moved the functionality there.
The problem was that users quite possibly had a configuration like
[main]
plugins=ifcfg-rh
in their "NetworkManager.conf". That meant, after upgrade users would
no longer have ibft support.
We fixed that by installing "/etc/NetworkManager/conf.d/10-ibft-plugin.conf"
which was read after the main file and contained:
[main]
plugins+=ibft
We no longer want to install configuration snippets with our core packages to
/etc. Avoid the regression by changing the meaning of "ifcfg-rh". By enabling
"ifcfg-rh" you now implicitly enable "ibft" plugin as well. This can be
turned off via "no-ibft". And you can continue to enable "ibft" plugin
alone.
Diffstat (limited to 'contrib/fedora/rpm/NetworkManager.spec')
| -rw-r--r-- | contrib/fedora/rpm/NetworkManager.spec | 7 |
1 files changed, 2 insertions, 5 deletions
diff --git a/contrib/fedora/rpm/NetworkManager.spec b/contrib/fedora/rpm/NetworkManager.spec index aa091e04f1..0786b305a8 100644 --- a/contrib/fedora/rpm/NetworkManager.spec +++ b/contrib/fedora/rpm/NetworkManager.spec @@ -84,8 +84,7 @@ URL: http://www.gnome.org/projects/NetworkManager/ Source: __SOURCE1__ Source1: NetworkManager.conf Source2: 00-server.conf -Source3: 10-ibft-plugin.conf -Source4: 20-connectivity-fedora.conf +Source3: 20-connectivity-fedora.conf #Patch1: 0001-some.patch @@ -446,8 +445,7 @@ make install DESTDIR=$RPM_BUILD_ROOT mkdir -p $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/conf.d mkdir -p $RPM_BUILD_ROOT%{nmlibdir}/conf.d %{__cp} %{SOURCE2} $RPM_BUILD_ROOT%{nmlibdir}/conf.d/ -%{__cp} %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/conf.d -%{__cp} %{SOURCE4} $RPM_BUILD_ROOT%{nmlibdir}/conf.d/ +%{__cp} %{SOURCE3} $RPM_BUILD_ROOT%{nmlibdir}/conf.d/ # create a VPN directory %{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}/NetworkManager/VPN @@ -547,7 +545,6 @@ fi %dir %{_sysconfdir}/%{name}/conf.d %dir %{nmlibdir} %dir %{nmlibdir}/conf.d -%config %{_sysconfdir}/%{name}/conf.d/10-ibft-plugin.conf %{_mandir}/man1/* %{_mandir}/man5/* %{_mandir}/man8/* |