From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ian Campbell Subject: Re: [PATCH OSSTEST 0/5] Debian Jessie patches Date: Thu, 28 May 2015 11:28:57 +0100 Message-ID: <1432808937.14664.298.camel@citrix.com> References: <1432144588-2102-1-git-send-email-wei.liu2@citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail6.bemta3.messagelabs.com ([195.245.230.39]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Yxv3f-0007Vy-Bi for xen-devel@lists.xenproject.org; Thu, 28 May 2015 10:29:03 +0000 In-Reply-To: <1432144588-2102-1-git-send-email-wei.liu2@citrix.com> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xen.org Errors-To: xen-devel-bounces@lists.xen.org To: Wei Liu Cc: xen-devel@lists.xenproject.org, ian.jackson@eu.citrix.com List-Id: xen-devel@lists.xenproject.org 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 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 --- 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