summaryrefslogtreecommitdiffstats
path: root/perl-install
diff options
context:
space:
mode:
authorMartin Whitaker <mageia@martin-whitaker.me.uk>2017-07-24 23:25:01 +0100
committerThomas Backlund <tmb@mageia.org>2018-01-09 23:06:56 +0200
commit4d96d7a4c32186d7597f2f8f6f75eb1d8c9bf181 (patch)
tree473c2017ee66bb7f62bbf78b0c94b9a742acc70d /perl-install
parentf70da6dee2087dbcb26e1ae6e00c5ea859c0c787 (diff)
downloaddrakx-4d96d7a4c32186d7597f2f8f6f75eb1d8c9bf181.tar
drakx-4d96d7a4c32186d7597f2f8f6f75eb1d8c9bf181.tar.gz
drakx-4d96d7a4c32186d7597f2f8f6f75eb1d8c9bf181.tar.bz2
drakx-4d96d7a4c32186d7597f2f8f6f75eb1d8c9bf181.tar.xz
drakx-4d96d7a4c32186d7597f2f8f6f75eb1d8c9bf181.zip
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.
Diffstat (limited to 'perl-install')
-rw-r--r--perl-install/NEWS1
-rw-r--r--perl-install/bootloader.pm2
2 files changed, 2 insertions, 1 deletions
diff --git a/perl-install/NEWS b/perl-install/NEWS
index 8fdc2bf77..c6a33351f 100644
--- a/perl-install/NEWS
+++ b/perl-install/NEWS
@@ -2,6 +2,7 @@
o Combine bootloader perImageAppend and default_append keys
(mga#21263, mga#21250)
o Fix drakboot video mode selection when using grub2 (mga#21246)
+ o Fix parsing of grub2 menu entries to support 16-bit mode (mga#21247).
- iwlwifi-agn-ucode is renamed to iwlwifi-firmware (mga#22316)
- update list of modules needing firmware
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;