diff options
| -rw-r--r-- | perl-install/NEWS | 1 | ||||
| -rw-r--r-- | perl-install/bootloader.pm | 2 |
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; |