diff options
| author | Thierry Vignaud <tv@mageia.org> | 2013-04-22 21:43:44 +0000 |
|---|---|---|
| committer | Thierry Vignaud <tv@mageia.org> | 2013-04-22 21:43:44 +0000 |
| commit | e651eaa8011ee732d0ef05d28f12eadbb778a751 (patch) | |
| tree | 046bbb114e4acded62c2b5870152e8e37e665581 | |
| parent | 28e0579187f75aaac981cea55d485aa1e9cbdf03 (diff) | |
| download | rpmdrake-e651eaa8011ee732d0ef05d28f12eadbb778a751.tar rpmdrake-e651eaa8011ee732d0ef05d28f12eadbb778a751.tar.gz rpmdrake-e651eaa8011ee732d0ef05d28f12eadbb778a751.tar.bz2 rpmdrake-e651eaa8011ee732d0ef05d28f12eadbb778a751.tar.xz rpmdrake-e651eaa8011ee732d0ef05d28f12eadbb778a751.zip | |
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)
| -rw-r--r-- | NEWS | 3 | ||||
| -rw-r--r-- | Rpmdrake/rpmnew.pm | 4 |
2 files changed, 7 insertions, 0 deletions
@@ -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 |