On Mon, 2015-04-13 at 17:19 -0400, longtao.pang wrote:
> Support situations of grub that have vmlinuz and other things starting
> with path of '/boot' rather than '/'.
>
> Signed-off-by: longtao.pang <longtaox.p...@intel.com>
Acked-by: Ian Campbell <ian.campb...@citrix.com>
> ---
> Osstest/Debian.pm | 8 ++++----
> 1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/Osstest/Debian.pm b/Osstest/Debian.pm
> index 378af54..1a57cdd 100644
> --- a/Osstest/Debian.pm
> +++ b/Osstest/Debian.pm
> @@ -449,21 +449,21 @@ sub setupboot_grub2 ($$$$) {
> if (m/^submenu\s+[\'\"](.*)[\'\"].*\{\s*$/) {
> $submenu={ StartLine =>$.};
> }
> - 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+)/) {
_______________________________________________
Xen-devel mailing list
Xen-devel@lists.xen.org
http://lists.xen.org/xen-devel
