summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThierry Vignaud <thierry.vignaud@gmail.com>2017-09-18 15:08:33 +0200
committerThierry Vignaud <thierry.vignaud@gmail.com>2017-09-18 15:24:42 +0200
commit9f25072009f28fb1cbaec245ab6ea865e680466b (patch)
treee6f535205357db36c3be65b8abc0b507b5c4c9e4
parent963ce2cca0b4bc4ac2fd64209c79e61f3c136d4b (diff)
downloaddrakx-9f25072009f28fb1cbaec245ab6ea865e680466b.tar
drakx-9f25072009f28fb1cbaec245ab6ea865e680466b.tar.gz
drakx-9f25072009f28fb1cbaec245ab6ea865e680466b.tar.bz2
drakx-9f25072009f28fb1cbaec245ab6ea865e680466b.tar.xz
drakx-9f25072009f28fb1cbaec245ab6ea865e680466b.zip
(read_grub2) handle several levels of submenus
needed anyway after last commit (cherry picked from commit 59dfe929349aa4e9f138cd2e311fda9dad146b5a)
-rw-r--r--perl-install/bootloader.pm2
1 files changed, 1 insertions, 1 deletions
diff --git a/perl-install/bootloader.pm b/perl-install/bootloader.pm
index 1e629345e..42f4f9586 100644
--- a/perl-install/bootloader.pm
+++ b/perl-install/bootloader.pm
@@ -327,7 +327,7 @@ sub read_grub2() {
}
} elsif (/initrd\s+(\S+)/ || /module\s+(\S+initrd\S+)\s+(.*)?/) {
$entry->{initrd} = $1;
- } elsif (/^submenu\s+['"]([^']+)["']/) {
+ } elsif (/submenu\s+['"]([^']+)["']/) {
push @menus, $1;
} elsif (/^\s+}/) {
if ($entry) {