]> xenbits.xensource.com Git - people/liuw/osstest.git/commitdiff
Debian: grub2: Allow submenu and menuentry items to be indented.
authorIan Campbell <ian.campbell@citrix.com>
Thu, 28 May 2015 08:24:51 +0000 (09:24 +0100)
committerIan Jackson <ian.jackson@eu.citrix.com>
Tue, 23 Jun 2015 15:43:55 +0000 (16:43 +0100)
Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
Acked-by: Ian Jackson <ian.jackson@eu.citrix.com>
Osstest/Debian.pm

index b1a5396f99d569cf245fba02af37671a9f261391..929d22e86aac87421194b3ab444aebd836b75848 100644 (file)
@@ -445,12 +445,12 @@ sub setupboot_grub2 ($$$$) {
             if (m/^function.*\{/) {
                 $entry= { StartLine => $. };
             }
-            if (m/^menuentry\s+[\'\"](.*)[\'\"].*\{\s*$/) {
+            if (m/^\s*menuentry\s+[\'\"](.*)[\'\"].*\{\s*$/) {
                 die $entry->{StartLine} if $entry;
                 $entry= { Title => $1, StartLine => $., MenuEntryPath => join ">", @offsets };
                 $offsets[$#offsets]++;
             }
-            if (m/^submenu\s+[\'\"](.*)[\'\"].*\{\s*$/) {
+            if (m/^\s*submenu\s+[\'\"](.*)[\'\"].*\{\s*$/) {
                 $submenu={ StartLine =>$., MenuEntryPath => join ">", @offsets };
                 push @offsets,(0);
             }