summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorMartin Whitaker <mageia@martin-whitaker.me.uk>2018-08-05 17:03:02 +0100
committerMartin Whitaker <mageia@martin-whitaker.me.uk>2018-08-11 21:03:59 +0100
commitf0fe28807a30317d43c78c323311790e4095a5b4 (patch)
tree1ad33352965555388343c76cfeb5e98130fe26ef /perl-install
parentf241fed054e3cc0c51780bfb6b56bf22c838135c (diff)
downloaddrakx-f0fe28807a30317d43c78c323311790e4095a5b4.tar
drakx-f0fe28807a30317d43c78c323311790e4095a5b4.tar.gz
drakx-f0fe28807a30317d43c78c323311790e4095a5b4.tar.bz2
drakx-f0fe28807a30317d43c78c323311790e4095a5b4.tar.xz
drakx-f0fe28807a30317d43c78c323311790e4095a5b4.zip
bootloader: include the 'Mageia' entry in the grub2 Default choices (mga#23393)
A parsing bug in bootloader::read_grub2() stopped the main menuentry being added to $bootloader{entries}.
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/NEWS1
-rw-r--r--perl-install/bootloader.pm2
-rw-r--r--perl-install/install/NEWS2
3 files changed, 4 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index d2a1af188..8f871177f 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,4 @@
+- drakboot: include the "Mageia" entry in the gub2 Default choices (mga#23393)
- recognize smartpqi driver (mga#23305)
Version 17.98 - 22 June 2018
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index 0c6240a80..7c8a6c15c 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -342,7 +342,7 @@ sub read_grub2() {
$entry->{initrd} = $1;
} elsif (/submenu\s+['"]([^']+)["']/) {
push @menus, $1;
- } elsif (/^\s+}/) {
+ } elsif (/^\s*}/) {
if ($entry) {
push @{$bootloader{entries}}, $entry;
undef $entry;
diff --git a/perl-install/install/NEWS b/perl-install/install/NEWS
index 5e9383b08..3d39c7b0e 100644
--- a/perl-install/install/NEWS
+++ b/perl-install/install/NEWS
@@ -1,3 +1,5 @@
+- bootloader: include the "Mageia" entry in the gub2 Default choices (mga#23393)
+
Version 17.99 - 9 August 2018
- adapt to libinput 1.12 RC1