summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJiří Klimeš <jklimes@redhat.com>2014-10-21 14:56:30 +0200
committerJiří Klimeš <jklimes@redhat.com>2014-10-21 15:15:46 +0200
commit5d66f91de812af323668a7c5263c85f1a1fb988f (patch)
tree18b5fc7bc200efaa15d6d4bcb0121f5d05e3621c
parent7d04618645f797d84c3f8692af6dfac1d67cb376 (diff)
downloadNetworkManager-5d66f91de812af323668a7c5263c85f1a1fb988f.tar.gz
contrib/rpm: do not override configuration files on updates (rh #1153901)
Rather leave modified configuration files untouched and save the new files with .rpmnew suffix. http://stackoverflow.com/questions/14511334/rpm-upgrade-handling-of-config-files https://bugzilla.redhat.com/show_bug.cgi?id=1153901
-rw-r--r--contrib/fedora/rpm/NetworkManager.spec4
1 files changed, 2 insertions, 2 deletions
diff --git a/contrib/fedora/rpm/NetworkManager.spec b/contrib/fedora/rpm/NetworkManager.spec
index 4ee0a3eb4d..8f82581588 100644
--- a/contrib/fedora/rpm/NetworkManager.spec
+++ b/contrib/fedora/rpm/NetworkManager.spec
@@ -627,12 +627,12 @@ fi
%files config-connectivity-fedora
%defattr(-,root,root,0755)
%dir %{_sysconfdir}/%{name}/conf.d
-%config %{_sysconfdir}/%{name}/conf.d/20-connectivity-fedora.conf
+%config(noreplace) %{_sysconfdir}/%{name}/conf.d/20-connectivity-fedora.conf
%files config-server
%defattr(-,root,root,0755)
%dir %{_sysconfdir}/%{name}/conf.d
-%config %{_sysconfdir}/%{name}/conf.d/00-server.conf
+%config(noreplace) %{_sysconfdir}/%{name}/conf.d/00-server.conf
%if 0%{?with_nmtui}
%files tui