From e651eaa8011ee732d0ef05d28f12eadbb778a751 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <tv@mageia.org>
Date: Mon, 22 Apr 2013 21:43:44 +0000
Subject: make --merge-all-rpmnew less dangerous

let's just ignore /etc/{passwd,group,(g)shadow,hosts,resolv.conf}
it's too dangerous to offer people to overwrite those with .rpmnew
files...

(reported by tmb)
---
 NEWS               | 3 +++
 Rpmdrake/rpmnew.pm | 4 ++++
 2 files changed, 7 insertions(+)

diff --git a/NEWS b/NEWS
index e28b6cc3..eaafdf95 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+- --merge-all-rpmnew mode:
+  o ignore /etc/{passwd,group,(g)shadow,hosts,resolv.conf} (too dangerous)
+
 Version 5.47 - 21 Apr 2013, Thierry Vignaud
 
 - fix install dialog title (mga#9550)
diff --git a/Rpmdrake/rpmnew.pm b/Rpmdrake/rpmnew.pm
index 4fd4a4fe..0c9fa700 100644
--- a/Rpmdrake/rpmnew.pm
+++ b/Rpmdrake/rpmnew.pm
@@ -41,11 +41,15 @@ our @EXPORT = qw(dialog_rpmnew do_merge_if_needed);
 my %ignores_rpmnew = map { $_ => 1 } qw(
     /etc/adjtime
     /etc/fstab
+    /etc/hosts
     /etc/group
     /etc/ld.so.conf
     /etc/localtime
     /etc/modules
+    /etc/gshadow
     /etc/passwd
+    /etc/resolv.conf
+    /etc/shadow
     /etc/security/fileshare.conf
     /etc/shells
     /etc/sudoers
-- 
cgit v1.2.1