From mboxrd@z Thu Jan 1 00:00:00 1970 From: Ian Jackson Subject: [OSSTEST PATCH 3/9] Debian grub2: Correct a mistake in Xen entry parsing pattern Date: Fri, 25 Sep 2015 12:37:02 +0100 Message-ID: <1443181028-22705-4-git-send-email-ian.jackson@eu.citrix.com> References: <1443181028-22705-1-git-send-email-ian.jackson@eu.citrix.com> Mime-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Return-path: Received: from mail6.bemta5.messagelabs.com ([195.245.231.135]) by lists.xen.org with esmtp (Exim 4.72) (envelope-from ) id 1ZfRJW-0007gz-7o for xen-devel@lists.xenproject.org; Fri, 25 Sep 2015 11:37:18 +0000 In-Reply-To: <1443181028-22705-1-git-send-email-ian.jackson@eu.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@lists.xenproject.org Cc: Robert Ho , Ian Jackson , Ian Campbell List-Id: xen-devel@lists.xenproject.org From: Robert Ho In b77a6a2522d8 "Changes to support '/boot' leading paths of kernel, xen, in grub", this pattern was erroneously changed. Revert that aspect of that commit, so that we once again require Xen image versions to start with a digit. Signed-off-by: Robert Ho Signed-off-by: Ian Jackson --- Osstest/Debian.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Osstest/Debian.pm b/Osstest/Debian.pm index 2b8d9f3..7677fa3 100644 --- a/Osstest/Debian.pm +++ b/Osstest/Debian.pm @@ -479,7 +479,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.7.10.4