From mboxrd@z Thu Jan 1 00:00:00 1970 From: Robert Ho Subject: [OSSTest Nested v12 02/21] Correct a mistake in setboot_grup2() of Xen entry parsing pattern Date: Fri, 28 Aug 2015 23:07:51 +0800 Message-ID: <1440774490-16725-3-git-send-email-robert.hu@intel.com> References: <1440774490-16725-1-git-send-email-robert.hu@intel.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: In-Reply-To: <1440774490-16725-1-git-send-email-robert.hu@intel.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@lists.xen.org, robert.hu@intel.com Cc: wei.liu2@citrix.com, Ian.Jackson@eu.citrix.com, ian.campbell@citrix.com, di.zheng@intel.com, gordon.jin@intel.com List-Id: xen-devel@lists.xenproject.org In previous adding of 'submenu' parsing code, a mistake was made. Now restore the match pattern to original. Signed-off-by: Robert Ho --- Osstest/Debian.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Osstest/Debian.pm b/Osstest/Debian.pm index c6b4720..74a99a3 100644 --- a/Osstest/Debian.pm +++ b/Osstest/Debian.pm @@ -475,7 +475,7 @@ sub setupboot_grub2 ($$$$) { $entry->{Hv}= $1; $entry->{Chainload} = 1; } - if (m/^\s*multiboot\s*(?:\/boot)?\/(xen\S+)/) { + if (m/^\s*multiboot\s*(?:\/boot)?\/(xen\-[0-9][-+.0-9a-z]*\S+)/) { die unless $entry; $entry->{Hv}= $1; $entry->{Chainload} = 0; -- 1.8.3.1