diff options
| author | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2020-12-19 21:05:47 +0000 |
|---|---|---|
| committer | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2020-12-19 21:56:02 +0000 |
| commit | e4219ae4165122c8fce9380cbf99363454b4586b (patch) | |
| tree | f57a03e9ad08ec90c1d64072ebdfdd3c8624ca82 | |
| parent | 057a1ef4ebdf018d9f260faf34a2f40f7b2227f7 (diff) | |
| download | drakx-e4219ae4165122c8fce9380cbf99363454b4586b.tar drakx-e4219ae4165122c8fce9380cbf99363454b4586b.tar.gz drakx-e4219ae4165122c8fce9380cbf99363454b4586b.tar.bz2 drakx-e4219ae4165122c8fce9380cbf99363454b4586b.tar.xz drakx-e4219ae4165122c8fce9380cbf99363454b4586b.zip | |
Fix false detection of GRUB2 when installed in ESP but not in /boot.
This caused the installer to select non-graphical GRUB2 as the default
bootloader method (mga#27816).
| -rw-r--r-- | perl-install/NEWS | 2 | ||||
| -rw-r--r-- | perl-install/bootloader.pm | 2 | ||||
| -rw-r--r-- | perl-install/install/NEWS | 3 |
3 files changed, 6 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS index 553d1d463..f957b43b8 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -1,3 +1,5 @@ +- drakboot: + o fix false detection of GRUB2 when installed in ESP but not in /boot (mga#27816) - diskdrake: o fix adding parts to extended partition on hybrid ISO (mga#27862) o erase iso9660 signature when clearing hybrid ISO disk (mga#27864) diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm index c09b12330..d4533da39 100644 --- a/perl-install/bootloader.pm +++ b/perl-install/bootloader.pm @@ -360,7 +360,7 @@ Read back GRUB2 config =cut sub read_grub2() { - my %bootloader = read_grub2_install_sh(); + my %bootloader = read_grub2_install_sh() if -e get_grub2_install_sh(); return if is_empty_hash_ref(\%bootloader) & !-s "$::prefix/boot/grub2/grub.cfg"; my %h = getVarsFromSh("$::prefix/etc/default/grub"); $bootloader{timeout} = $h{GRUB_TIMEOUT}; diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS index b88e624d5..974a5d1a2 100644 --- a/perl-install/install/NEWS +++ b/perl-install/install/NEWS @@ -1,3 +1,6 @@ +- bootloader: + o fix false detection of GRUB2 when installed in ESP but not in /boot, + which caused boot method to default to non-graphical GRUB2 (mga#27816) - partitioning: o erase iso9660 signature when clearing hybrid ISO disk (mga#27864) - support https in media URL (mga#27776) |