From mboxrd@z Thu Jan 1 00:00:00 1970 From: David Markey Subject: Re: Patch to fix pygrub with grub2 when /boot is a separate partition Date: Fri, 5 Mar 2010 09:28:14 +0000 Message-ID: <6894a6471003050128p314ca36av7fcc9c5431533ab2@mail.gmail.com> References: <6894a6471003050020i213db4e1u7c8a57c5a392d7a1@mail.gmail.com> <1267778983.20243.26.camel@localhost.localdomain> Reply-To: admin@dmarkey.com Mime-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0858859316==" Return-path: In-Reply-To: <1267778983.20243.26.camel@localhost.localdomain> List-Unsubscribe: , List-Post: List-Help: List-Subscribe: , Sender: xen-devel-bounces@lists.xensource.com Errors-To: xen-devel-bounces@lists.xensource.com To: Ian Campbell Cc: Xen-devel List-Id: xen-devel@lists.xenproject.org --===============0858859316== Content-Type: multipart/alternative; boundary=001485f7d624aff94e04810a5514 --001485f7d624aff94e04810a5514 Content-Type: text/plain; charset=ISO-8859-1 Oops sorry. Signed-off-by: David Markey --- /a/usr/bin/pygrub 2010-03-04 12:32:36.000000000 +0000 +++ /b/usr/bin/pygrub 2010-03-05 08:16:57.000000000 +0000 @@ -383,7 +383,7 @@ ["/boot/grub/menu.lst", "/boot/grub/grub.conf", "/grub/menu.lst", "/grub/grub.conf"]) + \ map(lambda x: (x,grub.GrubConf.Grub2ConfigFile), - ["/boot/grub/grub.cfg"]) + ["/boot/grub/grub.cfg","/grub/grub.cfg"]) if not fs: # set the config file and parse it On 5 March 2010 08:49, Ian Campbell wrote: > On Fri, 2010-03-05 at 08:20 +0000, David Markey wrote: > > Pygrub doesn't detect the grub2 config file when it's on a > > separate /boot partition. This should fix it. > > Thanks. You should include a Signed-off-by line. > > Acked-by: Ian Campbell > > Ian. > > > > > > > > > > > --- /a/usr/bin/pygrub 2010-03-04 12:32:36.000000000 +0000 > > +++ /b/usr/bin/pygrub 2010-03-05 08:16:57.000000000 +0000 > > @@ -383,7 +383,7 @@ > > ["/boot/grub/menu.lst", > > "/boot/grub/grub.conf", > > "/grub/menu.lst", "/grub/grub.conf"]) + \ > > map(lambda x: > > (x,grub.GrubConf.Grub2ConfigFile), > > - ["/boot/grub/grub.cfg"]) > > + ["/boot/grub/grub.cfg","/grub/grub.cfg"]) > > > > > > if not fs: > > # set the config file and parse it > > > > > > > --001485f7d624aff94e04810a5514 Content-Type: text/html; charset=ISO-8859-1 Content-Transfer-Encoding: quoted-printable
Oop= s sorry.


Signed-off-by: David Markey <david@dmarkey.com>
--- /a/us= r/bin/pygrub =A0 2010-03-04 12:32:36.000000000 +0000
+++ /b/usr/b= in/pygrub =A0 2010-03-05 08:16:57.000000000 +0000
@@ -383,7 +383,7 @@
=A0=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 =A0 =A0["/boot/grub/menu.lst", "/boot/grub/grub.= conf",
=A0=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 "/grub/menu.lst", "/grub/grub.conf"]) + \
=A0=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0map(lambda x: (x,gru= b.GrubConf.Grub2ConfigFile),
- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 = =A0 =A0 =A0 =A0 =A0 ["/boot/grub/grub.cfg"])
+ =A0 =A0 = =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 ["/boot/grub/grub.cfg"= ;,"/grub/grub.cfg"])

=A0=A0 =A0 =A0 =A0 if not fs:
=A0=A0 =A0 =A0 = =A0 =A0 =A0 # set the config file and parse it

<= div>

On 5 March 2010 08:49, Ian Cam= pbell <Ian.= Campbell@citrix.com> wrote:
On Fri, 2010-03-05 at 08:= 20 +0000, David Markey wrote:
> Pygrub doesn't detect the grub2 config file when it's on a
> separate /boot partition. This should fix it.

Thanks. You should include a Signed-off-by line.

Acked-by: Ian Campbell <ian.c= ampbell@citrix.com>

Ian.

>
>
>
>
> --- /a/usr/bin/pygrub =A0 2010-03-04 12:32:36.000000000 +0000
> +++ /b/usr/bin/pygrub =A0 2010-03-05 08:16:57.000000000 +0000
> @@ -383,7 +383,7 @@
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 ["/boot/g= rub/menu.lst",
> "/boot/grub/grub.conf",
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0"/grub= /menu.lst", "/grub/grub.conf"]) + \
> =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 map(lambda x:
> (x,grub.GrubConf.Grub2ConfigFile),
> - =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 ["/boot/gru= b/grub.cfg"])
> + =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 ["/boot/gru= b/grub.cfg","/grub/grub.cfg"])
>
>
> =A0 =A0 =A0 =A0 =A0if not fs:
> =A0 =A0 =A0 =A0 =A0 =A0 =A0# set the config file and parse it
>
>



--001485f7d624aff94e04810a5514-- --===============0858859316== Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Content-Disposition: inline _______________________________________________ Xen-devel mailing list Xen-devel@lists.xensource.com http://lists.xensource.com/xen-devel --===============0858859316==--