Attachment 10302 Details for Bug 23393 – Patch that fixes the bug

Patch that fixes the bug

0001-bootloader-allow-the-Mageia-entry-to-be-selected-as-.patch (text/plain), 808 bytes, created by Martin Whitaker on 2018-08-05 18:22:01 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Whitaker

Created: 2018-08-05 18:22:01 CEST

Size: 808 bytes

patch

obsolete

From 3abd40b07cdcbccebeb27224824821b798216b22 Mon Sep 17 00:00:00 2001
From: Martin Whitaker <mageia@martin-whitaker.me.uk>
Date: Sun, 5 Aug 2018 17:03:02 +0100
Subject: [PATCH] bootloader: allow the 'Mageia' entry to be selected as the
 grub2 default (mga#23393)

A parsing bug in bootloader::read_grub2() stopped the main menuentry
being added to $bootloader{entries}.

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;
-- 
2.13.7

Actions: View

Attachments on bug 23393: 10302