Attachment 9801 Details for Bug 21247 – Updated fix for parsing grub2 entries

Updated fix for parsing grub2 entries

0001-Fix-parsing-of-grub2-menu-entries-to-support-16-bit-.patch (text/plain), 936 bytes, created by Martin Whitaker on 2017-11-24 12:43:42 CET

(hide)

Description:

Filename:

MIME Type:

Creator: Martin Whitaker

Created: 2017-11-24 12:43:42 CET

Size: 936 bytes

patch

obsolete

From 7e49741d24081ad44ad5d3fec025f0f3f4841955 Mon Sep 17 00:00:00 2001
From: Martin Whitaker <mageia@martin-whitaker.me.uk>
Date: Mon, 24 Jul 2017 23:25:01 +0100
Subject: [PATCH] Fix parsing of grub2 menu entries to support 16-bit mode
 (mga#21247).

This enables bootloader::read_grub2 to recognise the initrd16 keyword,
which is used by default on x86 machines.

diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index 2ffc7eccc..fff70cfb7 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -329,7 +329,7 @@ sub read_grub2() {
 	        $entry->{vga} = $vga->[0] =~ /vga=(.*)/ && $1;
 	        $entry->{append} = join(' ', @$other);
 	    }
-	} elsif (/initrd\s+(\S+)/ || /module\s+(\S+initrd\S+)\s+(.*)?/) {
+	} elsif (/initrd(?:16)?\s+(\S+)/ || /module\s+(\S+initrd\S+)\s+(.*)?/) {
 	    $entry->{initrd} = $1;
 	} elsif (/submenu\s+['"]([^']+)["']/) {
 	    push @menus, $1;
-- 
2.13.6

Actions: View

Attachments on bug 21247: 9515 | 9801