summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Backlund <tmb@mageia.org>2015-01-09 03:19:51 +0159
committerThomas Backlund <tmb@mageia.org>2015-01-09 03:19:51 +0159
commit5af43b9e8eb15108b3c1195f393754e42e432c3e (patch)
treecf7c92f4660289005c0f59f5ed76729d69501b74
parent35a3afdc2e83ef375291384acb61e4800374ceb6 (diff)
downloaddrakx-5af43b9e8eb15108b3c1195f393754e42e432c3e.tar
drakx-5af43b9e8eb15108b3c1195f393754e42e432c3e.tar.gz
drakx-5af43b9e8eb15108b3c1195f393754e42e432c3e.tar.bz2
drakx-5af43b9e8eb15108b3c1195f393754e42e432c3e.tar.xz
drakx-5af43b9e8eb15108b3c1195f393754e42e432c3e.zip
Revert "bootloader: enable isInstall during live mode so we install to chroot and not on live image"
This reverts commit f8fd031d3e70a7f4c25f0be93e472cecc0dee00e. didn't work as intended.
-rw-r--r--perl-install/bootloader.pm2
1 files changed, 0 insertions, 2 deletions
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index e20841951..7ca1fdbf5 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -2059,8 +2059,6 @@ sub ensure_pkg_is_installed {
my %h = ('grub2' => 'grub2-install');
my $main_method = main_method($bootloader->{method});
if (member($main_method, qw(grub grub2 lilo))) {
- # install of bootloader must be done in chroot, not on live image
- local $::isInstall = 1 if is_mgalive();
$do_pkgs->ensure_binary_is_installed($pkg{$main_method} || $main_method, $h{$main_method} || $main_method, 1) or return 0;
if ($bootloader->{method} eq 'grub-graphic') {
$do_pkgs->ensure_is_installed('mageia-gfxboot-theme', '/usr/share/gfxboot/themes/Mageia/boot/message', 1) or return 0;