diff options
| author | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2017-07-24 23:25:01 +0100 |
|---|---|---|
| committer | Martin Whitaker <mageia@martin-whitaker.me.uk> | 2018-05-28 11:42:47 +0100 |
| commit | 10c3fd004acec3e01b3de5100d04875ba35cae91 (patch) | |
| tree | cd2bfbce0abe602bc7447eedfaf8c4a5074de022 | |
| parent | 3931a427b2ef642725666429635c4ee7ae16d558 (diff) | |
| download | drakx-10c3fd004acec3e01b3de5100d04875ba35cae91.tar drakx-10c3fd004acec3e01b3de5100d04875ba35cae91.tar.gz drakx-10c3fd004acec3e01b3de5100d04875ba35cae91.tar.bz2 drakx-10c3fd004acec3e01b3de5100d04875ba35cae91.tar.xz drakx-10c3fd004acec3e01b3de5100d04875ba35cae91.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.
(cherry picked from commit 4d96d7a4c32186d7597f2f8f6f75eb1d8c9bf181)
| -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 ae0f025f2..c41fdac83 100644 --- a/perl-install/NEWS +++ b/perl-install/NEWS @@ -4,6 +4,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 c648378a8..89a2e55d0 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; |