From mboxrd@z Thu Jan  1 00:00:00 1970
From: Ian Campbell <ian.campbell@citrix.com>
Subject: Re: [OSSTEST Nested PATCH v8 2/7] Changes to support
 '/boot' leading paths of kernel, xen, in grub
Date: Tue, 21 Apr 2015 11:13:24 +0100
Message-ID: <1429611204.4743.17.camel@citrix.com>
References: <1428959990-24199-1-git-send-email-longtaox.pang@intel.com>
	<1428959990-24199-3-git-send-email-longtaox.pang@intel.com>
Mime-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Return-path: <xen-devel-bounces@lists.xen.org>
In-Reply-To: <1428959990-24199-3-git-send-email-longtaox.pang@intel.com>
List-Unsubscribe: <http://lists.xen.org/cgi-bin/mailman/options/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xen.org>
List-Help: <mailto:xen-devel-request@lists.xen.org?subject=help>
List-Subscribe: <http://lists.xen.org/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xen.org?subject=subscribe>
Sender: xen-devel-bounces@lists.xen.org
Errors-To: xen-devel-bounces@lists.xen.org
To: "longtao.pang" <longtaox.pang@intel.com>
Cc: wei.liu2@citrix.com, robert.hu@intel.com, Ian.Jackson@eu.citrix.com, xen-devel@lists.xen.org
List-Id: xen-devel@lists.xenproject.org

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.pang@intel.com>

Acked-by: Ian Campbell <ian.campbell@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+)/) {