@@ -529,17 +529,17 @@ sub setupboot_grub2 ($$$$) {
if (m/^\s*submenu\s+[\'\"](.*)[\'\"].*\{\s*$/) {
push @offsets,(0);
}
- if (m/^\s*chainloader\s*\/EFI\/osstest\/xen.efi/) {
+ if (m/^\s*chainloader\s+\/EFI\/osstest\/xen.efi/) {
die unless $entry;
$entry->{Hv}= $1;
$entry->{Chainload} = 1;
}
- if (m/^\s*multiboot2?\s*(?:\/boot)?\/(xen\-[0-9][-+.0-9a-z]*\S+)/) {
+ if (m/^\s*multiboot2?\s+(?:\/boot)?\/(xen\-[0-9][-+.0-9a-z]*\S+)/) {
die unless $entry;
$entry->{Hv}= $1;
$entry->{Chainload} = 0;
}
- if (m/^\s*multiboot2?\s*(?:\/boot)?\/(vmlinu[xz]-(\S+))\s+(.*)/) {
+ if (m/^\s*multiboot2?\s+(?:\/boot)?\/(vmlinu[xz]-(\S+))\s+(.*)/) {
die unless $entry;
$entry->{KernOnly}= $1;
$entry->{KernVer}= $2;
@@ -551,7 +551,7 @@ sub setupboot_grub2 ($$$$) {
$entry->{KernVer}= $2;
$entry->{KernOpts}= $3;
}
- if (m/^\s*module2?\s*(?:\/boot)?\/(initrd\S+)/) {
+ if (m/^\s*module2?\s+(?:\/boot)?\/(initrd\S+)/) {
$entry->{Initrd}= $1;
}
if (m/^\s*module2?\s*\/(xenpolicy\S+)/) {
These parsing regexps were all wrong! Signed-off-by: Ian Jackson <ian.jackson@eu.citrix.com> --- Osstest/Debian.pm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)