From 56c8070207a8395b7fb0c20eb200fd9bd8c76757 Mon Sep 17 00:00:00 2001
From: Thierry Vignaud <thierry.vignaud@gmail.com>
Date: Mon, 18 Sep 2017 15:04:02 +0200
Subject: (read_grub2) handle both linux & linux16

thus we got more data
---
 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 6f9ff4eec..cf3dfbc18 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -317,7 +317,7 @@ sub read_grub2() {
 	next if /^#/;
 	if (/menuentry\s+['"]([^']+)["']/) {
 	    $entry = { label => $1, real_label => join('>', @menus, $1) };
-	} elsif (/linux\s+(\S+)\s+(.*)?/ || /module\s+(\S+vmlinu\S+)\s+(.*)?/) {
+	} elsif (/linux(?:16)?\s+([^-]\S+)\s+(.*)?/ || /module\s+(\S+vmlinu\S+)\s+(.*)?/) {
 	    $entry->{type} = 'image';
 	    @$entry{qw(kernel_or_dev append)} = ($1, $2);
 	    my ($vga, $other) = partition { /^vga=/ } split(' ', $entry->{append});
-- 
cgit v1.2.1