From 538bd80652dfae4e45bdfb3e54892929262daa29 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Wed, 8 Jun 2016 16:58:12 +0200
Subject: do not override bootloader on upgrade (mga#18638)

---
 perl-install/install/NEWS   | 2 ++
 perl-install/install/any.pm | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

(limited to 'perl-install/install')

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};
-- 
cgit v1.2.1