summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--perl-install/NEWS2
-rw-r--r--perl-install/bootloader.pm2
-rw-r--r--perl-install/install/NEWS2
3 files changed, 5 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 75e29828e..460ea2a45 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -1,3 +1,5 @@
+- drakboot: include the "Mageia" entry in the gub2 Default choices (mga#23393)
+
Version 17.88.2 - 28 May 2018
- harddrake2:
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index 19f78b458..48a529d15 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -333,7 +333,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 44b46d1cc..1c1108423 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.88.2 - 28 May 2018
- diskdrake: