diff options
| author | Thomas Backlund <tmb@mageia.org> | 2013-05-08 21:33:56 +0000 |
|---|---|---|
| committer | Thomas Backlund <tmb@mageia.org> | 2013-05-08 21:33:56 +0000 |
| commit | 539b39e8bf5b24df215603664c543a3f5d99e0b6 (patch) | |
| tree | a0ceab3e16fa727cc93e694ab63ef11ecf11d792 | |
| parent | 85edb50821722d95d2d407d75455e0da579a88b7 (diff) | |
| download | rpmdrake-539b39e8bf5b24df215603664c543a3f5d99e0b6.tar rpmdrake-539b39e8bf5b24df215603664c543a3f5d99e0b6.tar.gz rpmdrake-539b39e8bf5b24df215603664c543a3f5d99e0b6.tar.bz2 rpmdrake-539b39e8bf5b24df215603664c543a3f5d99e0b6.tar.xz rpmdrake-539b39e8bf5b24df215603664c543a3f5d99e0b6.zip | |
- --merge-all-rpmnew mode:
o ignore /etc/crypttab (mga#10028)
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | Rpmdrake/rpmnew.pm | 1 |
2 files changed, 4 insertions, 0 deletions
@@ -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 |