diff options
| author | Thomas Haller <thaller@redhat.com> | 2015-06-07 15:58:11 +0200 |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2015-06-13 12:26:38 +0200 |
| commit | 6d8e5e70e55675bd9cbc440cab52dbcb19e642e0 (patch) | |
| tree | e7320d05b53aef4d9b9d1f3be445a6f1a4653e92 | |
| parent | 94b15229a2a68e914128e52da3b5363e53b4c268 (diff) | |
| download | NetworkManager-6d8e5e70e55675bd9cbc440cab52dbcb19e642e0.tar.gz | |
contrib/rpm: update spec file to install configuration snippets in "/usr/lib/NetworkManager/conf.d"
Don't move move "10-ibft-plugin.conf", because we need it to be
read *after* "NetworkManager.conf". Many users might have
an old "NetworkManager.conf" file that contains "plugin=ifcfg-rh".
| -rw-r--r-- | contrib/fedora/rpm/NetworkManager.spec | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/contrib/fedora/rpm/NetworkManager.spec b/contrib/fedora/rpm/NetworkManager.spec index c026cef08f..aa091e04f1 100644 --- a/contrib/fedora/rpm/NetworkManager.spec +++ b/contrib/fedora/rpm/NetworkManager.spec @@ -445,9 +445,9 @@ 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%{_sysconfdir}/%{name}/conf.d +%{__cp} %{SOURCE2} $RPM_BUILD_ROOT%{nmlibdir}/conf.d/ %{__cp} %{SOURCE3} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/conf.d -%{__cp} %{SOURCE4} $RPM_BUILD_ROOT%{_sysconfdir}/%{name}/conf.d +%{__cp} %{SOURCE4} $RPM_BUILD_ROOT%{nmlibdir}/conf.d/ # create a VPN directory %{__mkdir_p} $RPM_BUILD_ROOT%{_sysconfdir}/NetworkManager/VPN @@ -664,15 +664,15 @@ fi %files config-connectivity-fedora %defattr(-,root,root,0755) -%dir %{_sysconfdir}/%{name} -%dir %{_sysconfdir}/%{name}/conf.d -%config(noreplace) %{_sysconfdir}/%{name}/conf.d/20-connectivity-fedora.conf +%dir %{nmlibdir} +%dir %{nmlibdir}/conf.d +%{nmlibdir}/conf.d/20-connectivity-fedora.conf %files config-server %defattr(-,root,root,0755) -%dir %{_sysconfdir}/%{name} -%dir %{_sysconfdir}/%{name}/conf.d -%config(noreplace) %{_sysconfdir}/%{name}/conf.d/00-server.conf +%dir %{nmlibdir} +%dir %{nmlibdir}/conf.d +%{nmlibdir}/conf.d/00-server.conf %if 0%{?with_nmtui} %files tui |