Attachment 948461 Details for Bug 1153901 – [PATCH] do not override modified configuration files on updates

[patch] [PATCH] do not override modified configuration files on updates

0001-Do-not-override-configuration-files-on-updates-rh-11.patch (text/plain), 2.12 KB, created by Jirka Klimes on 2014-10-20 08:37:05 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Jirka Klimes

Created: 2014-10-20 08:37:05 UTC

Size: 2.12 KB

patch

obsolete

>From af37cbb0a84553505d0b6de07e3825f7da44fe58 Mon Sep 17 00:00:00 2001
>From: =?UTF-8?q?Ji=C5=99=C3=AD=20Klime=C5=A1?= <jklimes@redhat.com>
>Date: Mon, 20 Oct 2014 10:28:21 +0200
>Subject: [PATCH] Do not override configuration files on updates (rh #1153901)
>MIME-Version: 1.0
>Content-Type: text/plain; charset=UTF-8
>Content-Transfer-Encoding: 8bit
>
>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
>
>Signed-off-by: JiÅÃ KlimeÅ¡ <jklimes@redhat.com>
>---
> NetworkManager.spec | 11 +++++++----
> 1 file changed, 7 insertions(+), 4 deletions(-)
>
>diff --git a/NetworkManager.spec b/NetworkManager.spec
>index dfce894..3046500 100644
>--- a/NetworkManager.spec
>+++ b/NetworkManager.spec
>@@ -46,7 +46,7 @@ Name: NetworkManager
> Summary: Network connection manager and user applications
> Epoch: 1
> Version: 0.9.9.0
>-Release: 46%{snapshot}%{?dist}
>+Release: 47%{snapshot}%{?dist}
> Group: System Environment/Base
> License: GPLv2+
> URL: http://www.gnome.org/projects/NetworkManager/
>@@ -601,12 +601,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
>@@ -617,7 +617,10 @@ fi
> %endif
> 
> %changelog
>-* Fri Oct 17 2014 Dan Williams <dcbw@redhat.com> - 0.9.9.0-45.git20131003
>+* Mon Oct 20 2014 JiÅÃ KlimeÅ¡ <jklimes@redhat.com> - 0.9.9.0-47.git20131003
>+- don't override modified configuration files on updates (rh #1153901)
>+
>+* Fri Oct 17 2014 Dan Williams <dcbw@redhat.com> - 0.9.9.0-46.git20131003
> - ifcfg-rh: backport DHCP_SEND_HOSTNAME=no/yes option (rh #1001529)
> 
> * Thu Sep 25 2014 Lubomir Rintel <lkundrak@v3.sk> - 0.9.9.0-45.git20131003
>-- 
>1.7.11.7
>

Actions: View | Diff

Attachments on bug 1153901: 948461