From 539b39e8bf5b24df215603664c543a3f5d99e0b6 Mon Sep 17 00:00:00 2001
From: Thomas Backlund <tmb@mageia.org>
Date: Wed, 8 May 2013 21:33:56 +0000
Subject: - --merge-all-rpmnew mode:   o ignore /etc/crypttab (mga#10028)

---
 NEWS               | 3 +++
 Rpmdrake/rpmnew.pm | 1 +
 2 files changed, 4 insertions(+)

diff --git a/NEWS b/NEWS
index b5c88aba..ce4772b7 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+- --merge-all-rpmnew mode:
+  o ignore /etc/crypttab (mga#10028)
+
 Version 5.48 - 22 Apr 2013, Thierry Vignaud
 
 - --merge-all-rpmnew mode:
diff --git a/Rpmdrake/rpmnew.pm b/Rpmdrake/rpmnew.pm
index 70880a10..5a897fe6 100644
--- a/Rpmdrake/rpmnew.pm
+++ b/Rpmdrake/rpmnew.pm
@@ -40,6 +40,7 @@ our @EXPORT = qw(dialog_rpmnew do_merge_if_needed);
 # /var/lib/nfs/etab /var/lib/nfs/rmtab /var/lib/nfs/xtab /var/cache/man/whatis
 my %ignores_rpmnew = map { $_ => 1 } qw(
     /etc/adjtime
+    /etc/crypttab
     /etc/fstab
     /etc/hosts
     /etc/group
-- 
cgit v1.2.1