Re: [PATCH OSSTEST 0/5] Debian Jessie patches

[Ian Campbell <ian.campbell@citrix.com>]

On Wed, 2015-05-20 at 18:56 +0100, Wei Liu wrote:
> I worked a little bit on upgrading Osstest to Jessie a few months ago but
> dropped the ball. Here are the patches I wrote.

With the recent change to support submenus I find I now need the below,
I think update-grub on Jessie must include some sort of
whitespace/reindent functionality compared with Wheezy.

----8>-----

>From 98079d6eb0a93c12e5e65c999bf87b5364b300bc Mon Sep 17 00:00:00 2001
From: Ian Campbell <ian.campbell@citrix.com>
Date: Thu, 28 May 2015 09:24:51 +0100
Subject: [PATCH] Debian: grub2: Allow submenu and menuentry items to be
 indented.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
---
 Osstest/Debian.pm | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/Osstest/Debian.pm b/Osstest/Debian.pm
index 0bf108b..16ea68b 100644
--- a/Osstest/Debian.pm
+++ b/Osstest/Debian.pm
@@ -444,12 +444,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);
             }
-- 
2.1.4