Debian grub2: Correct a mistake in Xen entry parsing pattern

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.hu@intel.com>
Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>

diff --git a/Osstest/Debian.pm b/Osstest/Debian.pm
index 2b8d9f3e67eca9d2fc430e4cf8d940280ca9b61a..7677fa340110d48ecbb38002005d4561b18a969e 100644 (file)
--- 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;