From 4d96d7a4c32186d7597f2f8f6f75eb1d8c9bf181 Mon Sep 17 00:00:00 2001 From: Martin Whitaker Date: Mon, 24 Jul 2017 23:25:01 +0100 Subject: 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. --- perl-install/bootloader.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'perl-install/bootloader.pm') diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm index 71ebbecf7..c10187002 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; -- cgit v1.2.1