From b77a6a2522d81cf434cf989ff818928f7576ad8a Mon Sep 17 00:00:00 2001 From: "longtao.pang" Date: Tue, 26 May 2015 17:08:20 +0800 Subject: [PATCH] Changes to support '/boot' leading paths of kernel, xen, in grub Support situations of grub that have vmlinuz and other things starting with path of '/boot' rather than '/'. Signed-off-by: longtao.pang Acked-by: Ian Campbell --- Osstest/Debian.pm | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/Osstest/Debian.pm b/Osstest/Debian.pm index a1c9def..f09cad6 100644 --- a/Osstest/Debian.pm +++ b/Osstest/Debian.pm @@ -453,21 +453,21 @@ sub setupboot_grub2 ($$$$) { $submenu={ StartLine =>$., MenuEntryPath => join ">", @offsets }; push @offsets,(0); } - if (m/^\s*multiboot\s*\/(xen\-[0-9][-+.0-9a-z]*\S+)/) { + if (m/^\s*multiboot\s*(?:\/boot)?\/(xen\S+)/) { die unless $entry; $entry->{Hv}= $1; } - if (m/^\s*multiboot\s*\/(vmlinu[xz]-(\S+))/) { + if (m/^\s*multiboot\s*(?:\/boot)?\/(vmlinu[xz]-(\S+))/) { die unless $entry; $entry->{KernOnly}= $1; $entry->{KernVer}= $2; } - if (m/^\s*module\s*\/(vmlinu[xz]-(\S+))/) { + if (m/^\s*module\s*(?:\/boot)?\/(vmlinu[xz]-(\S+))/) { die unless $entry; $entry->{KernDom0}= $1; $entry->{KernVer}= $2; } - if (m/^\s*module\s*\/(initrd\S+)/) { + if (m/^\s*module\s*(?:\/boot)?\/(initrd\S+)/) { $entry->{Initrd}= $1; } if (m/^\s*module\s*\/(xenpolicy\S+)/) { -- 2.39.5