From mboxrd@z Thu Jan 1 00:00:00 1970 From: Wei Liu Subject: [PATCH OSSTEST v3 07/11] Debian: grub2: Allow submenu and menuentry items to be indented. Date: Wed, 17 Jun 2015 14:06:40 +0100 Message-ID: <1434546404-2036-8-git-send-email-wei.liu2@citrix.com> References: <1434546404-2036-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.bemta14.messagelabs.com ([193.109.254.103]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1Z5D3i-00059o-Vr for xen-devel@lists.xenproject.org; Wed, 17 Jun 2015 13:07:15 +0000 In-Reply-To: <1434546404-2036-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: Xen-devel Cc: ian.jackson@eu.citrix.com, Ian Campbell List-Id: xen-devel@lists.xenproject.org From: Ian Campbell Signed-off-by: Ian Campbell Acked-by: Ian Jackson --- Osstest/Debian.pm | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Osstest/Debian.pm b/Osstest/Debian.pm index b1a5396..929d22e 100644 --- a/Osstest/Debian.pm +++ b/Osstest/Debian.pm @@ -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); } -- 1.9.1