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 <[email protected]> Signed-off-by: Ian Jackson <[email protected]> --- Osstest/Debian.pm | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Osstest/Debian.pm b/Osstest/Debian.pm index 16b47c5..9789ca6 100644 --- 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; } } -- 2.1.4 _______________________________________________ Xen-devel mailing list [email protected] https://lists.xenproject.org/mailman/listinfo/xen-devel
