aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <tv@mandriva.org>2009-04-14 10:16:12 +0000
committerThierry Vignaud <tv@mandriva.org>2009-04-14 10:16:12 +0000
commit16138ba6a0457232c8617e6c673dd92345ff0f8c (patch)
tree9837c8af7fb6b7fb2990d36d0aef3b486691b194
parent9a9f983acedf24570f49e63f9c1d12983d3d0c12 (diff)
downloadrpmdrake-16138ba6a0457232c8617e6c673dd92345ff0f8c.tar
rpmdrake-16138ba6a0457232c8617e6c673dd92345ff0f8c.tar.gz
rpmdrake-16138ba6a0457232c8617e6c673dd92345ff0f8c.tar.bz2
rpmdrake-16138ba6a0457232c8617e6c673dd92345ff0f8c.tar.xz
rpmdrake-16138ba6a0457232c8617e6c673dd92345ff0f8c.zip
ignore /etc/fstab for *.rpmnew
-rw-r--r--NEWS2
-rw-r--r--Rpmdrake/rpmnew.pm1
2 files changed, 3 insertions, 0 deletions
diff --git a/NEWS b/NEWS
index 27794502..b7a74c2e 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,5 @@
+- ignore /etc/fstab for *.rpmnew
+
Version 5.16 - 3 April 2009, Thierry Vignaud
- revert using installer hack that prevents having gray wait message dialogs on
diff --git a/Rpmdrake/rpmnew.pm b/Rpmdrake/rpmnew.pm
index 2545e5cd..325882be 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/fstab
/etc/group
/etc/ld.so.conf
/etc/localtime