diff options
| author | Thierry Vignaud <thierry.vignaud@gmail.com> | 2016-06-08 16:58:12 +0200 |
|---|---|---|
| committer | Thierry Vignaud <thierry.vignaud@gmail.com> | 2016-06-09 16:25:51 +0200 |
| commit | 538bd80652dfae4e45bdfb3e54892929262daa29 (patch) | |
| tree | 4f2a66cdd9498cc593ef225f979bd46a8945b8c5 | |
| parent | 257c414364378e9fd6e381578899e2c1e80ac848 (diff) | |
| download | drakx-538bd80652dfae4e45bdfb3e54892929262daa29.tar drakx-538bd80652dfae4e45bdfb3e54892929262daa29.tar.gz drakx-538bd80652dfae4e45bdfb3e54892929262daa29.tar.bz2 drakx-538bd80652dfae4e45bdfb3e54892929262daa29.tar.xz drakx-538bd80652dfae4e45bdfb3e54892929262daa29.zip | |
do not override bootloader on upgrade (mga#18638)
| -rw-r--r-- | perl-install/install/NEWS | 2 | ||||
| -rw-r--r-- | perl-install/install/any.pm | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index 22252826c..3f2550bce 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,5 @@ +- do not override bootloader on upgrade (mga#18638) + Version 17.35.1 - 7 June 2016 - fix selecting grub2 on !UEFI diff --git a/perl-install/install/any.pm b/perl-install/install/any.pm index 7e843abe0..d31d57fdb 100644 --- a/perl-install/install/any.pm +++ b/perl-install/install/any.pm @@ -612,7 +612,7 @@ sub setPackages { install::pkgs::select_by_package_names($urpm, [ $devel_kernel_pkg ], 1); } - install::pkgs::select_by_package_names_or_die($urpm, default_bootloader(), 1); + install::pkgs::select_by_package_names_or_die($urpm, default_bootloader(), 1) if !$o->{isUpgrade}; install::pkgs::select_by_package_names_or_die($urpm, ['basesystem'], 1); my $rpmsrate_flags_was_chosen = $o->{rpmsrate_flags_chosen}; |