Osstest/Debian: bootloader: Fix grub parsing for XSM and multiboot1

bca3edb4ac0d670098b7618cbaccf7577aca267a
  "Osstest/Debian: bootloader: Understand multiboot2 syntax"
was supposed to change `multiboot' and `module' in the grub2 menu
parser to `multiboot2?' and `module2?'.  But the entry for matching
XSM policy file lines was missing the ?, which broke all multiboot1
XSM tests.  Fix this.

Reported-by: Jan Beulich <jbeulich@suse.com>
Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com>

diff --git a/Osstest/Debian.pm b/Osstest/Debian.pm
index 16b47c5c43f7b2fb598a6473a88a6f358244ce7b..9789ca68dfed39faa60c57efb528b8c7c86dfe1c 100644 (file)
--- a/Osstest/Debian.pm
+++ b/Osstest/Debian.pm
@@ -532,7 +532,7 @@ sub setupboot_grub2 ($$$$) {
             if (m/^\s*module2?\s*(?:\/boot)?\/(initrd\S+)/) {
                 $entry->{Initrd}= $1;
             }
-           if (m/^\s*module2\s*\/(xenpolicy\S+)/) {
+           if (m/^\s*module2?\s*\/(xenpolicy\S+)/) {
                 $entry->{Xenpolicy}= $1;
             }
         }