diff options
| author | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2018-08-05 17:03:02 +0100 |
|---|---|---|
| committer | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2018-08-11 21:42:10 +0100 |
| commit | 8c04baa760dbdd8da29b558bc8a8e2f0e67a5c18 (patch) | |
| tree | 08e660a6a28c524cec0b1ab28cdd368ba18000da | |
| parent | 098ba988f0fd46c6de4b5bb30725b0dd37a8c7c3 (diff) | |
| download | drakx-8c04baa760dbdd8da29b558bc8a8e2f0e67a5c18.tar drakx-8c04baa760dbdd8da29b558bc8a8e2f0e67a5c18.tar.gz drakx-8c04baa760dbdd8da29b558bc8a8e2f0e67a5c18.tar.bz2 drakx-8c04baa760dbdd8da29b558bc8a8e2f0e67a5c18.tar.xz drakx-8c04baa760dbdd8da29b558bc8a8e2f0e67a5c18.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}.
(cherry picked from commit f0fe28807a30317d43c78c323311790e4095a5b4)
| -rw-r--r-- | perl-install/NEWS | 2 | ||||
| -rw-r--r-- | perl-install/bootloader.pm | 2 | ||||
| -rw-r--r-- | perl-install/install/NEWS | 2 |
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: |