From: Robert Ho <robert...@intel.com>
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 <robert...@intel.com>
Signed-off-by: Ian Jackson <ian.jack...@eu.citrix.com>
---
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
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
