From mboxrd@z Thu Jan  1 00:00:00 1970
From: Andrew Cooper <andrew.cooper3@citrix.com>
Subject: Re: [PATCH] tools/pygrub: Fix extlinux when /boot is a
 separate partition from /
Date: Wed, 18 Jun 2014 10:43:40 +0100
Message-ID: <53A15F4C.501@citrix.com>
References: <1402511515-21526-1-git-send-email-andrew.cooper3@citrix.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: <1402511515-21526-1-git-send-email-andrew.cooper3@citrix.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: Andrew Cooper <andrew.cooper3@citrix.com>
Cc: Ian Jackson <Ian.Jackson@eu.citrix.com>, Ian Campbell <Ian.Campbell@citrix.com>, Xen-devel <xen-devel@lists.xen.org>
List-Id: xen-devel@lists.xenproject.org

Ping?

On 11/06/14 19:31, Andrew Cooper wrote:
> Grub and Grub2 already cope with this.
>
> Reported-by: Joseph Hom <jhom@softlayer.com>
> Signed-off-by: Andrew Cooper <andrew.cooper3@citrix.com>
> CC: Ian Campbell <Ian.Campbell@citrix.com>
> CC: Ian Jackson <Ian.Jackson@eu.citrix.com>
> ---
>  tools/pygrub/src/pygrub |    4 +++-
>  1 file changed, 3 insertions(+), 1 deletion(-)
>
> diff --git a/tools/pygrub/src/pygrub b/tools/pygrub/src/pygrub
> index 4c35f9d..a4a2423 100644
> --- a/tools/pygrub/src/pygrub
> +++ b/tools/pygrub/src/pygrub
> @@ -418,7 +418,9 @@ class Grub:
>                     map(lambda x: (x,grub.ExtLinuxConf.ExtLinuxConfigFile),
>                         ["/boot/isolinux/isolinux.cfg",
>                          "/boot/extlinux/extlinux.conf",
> -                        "/boot/extlinux.conf"]) + \
> +                        "/boot/extlinux.conf",
> +                        "/extlinux/extlinux.conf",
> +                        "/extlinux.conf"]) + \
>                     map(lambda x: (x,grub.GrubConf.GrubConfigFile),
>                         ["/boot/grub/menu.lst", "/boot/grub/grub.conf",
>                          "/grub/menu.lst", "/grub/grub.conf"])