From mboxrd@z Thu Jan  1 00:00:00 1970
From: David Markey <admin@dmarkey.com>
Subject: Patch to fix pygrub with grub2 when /boot is a separate
	partition
Date: Fri, 5 Mar 2010 08:20:48 +0000
Message-ID: <6894a6471003050020i213db4e1u7c8a57c5a392d7a1@mail.gmail.com>
Reply-To: admin@dmarkey.com
Mime-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1991633291=="
Return-path: <xen-devel-bounces@lists.xensource.com>
List-Unsubscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xensource.com>
List-Help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-Subscribe: <http://lists.xensource.com/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
Sender: xen-devel-bounces@lists.xensource.com
Errors-To: xen-devel-bounces@lists.xensource.com
To: Xen-devel <xen-devel@lists.xensource.com>
List-Id: xen-devel@lists.xenproject.org

--===============1991633291==
Content-Type: multipart/alternative; boundary=001485f3bd5c90bd350481096448

--001485f3bd5c90bd350481096448
Content-Type: text/plain; charset=ISO-8859-1

Pygrub doesn't detect the grub2 config file when it's on a separate /boot
partition. This should fix it.


--- /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

--001485f3bd5c90bd350481096448
Content-Type: text/html; charset=ISO-8859-1
Content-Transfer-Encoding: quoted-printable

<div>Pygrub doesn&#39;t detect the grub2 config file when it&#39;s on a=A0s=
eparate=A0/boot partition. This should fix it.</div><div><br></div><div><br=
></div><div>--- /a/usr/bin/pygrub =A0 2010-03-04 12:32:36.000000000 +0000</=
div>
<div>+++ /b/usr/bin/pygrub =A0 2010-03-05 08:16:57.000000000 +0000</div><di=
v>@@ -383,7 +383,7 @@</div><div>=A0=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =
=A0 =A0 =A0 =A0[&quot;/boot/grub/menu.lst&quot;, &quot;/boot/grub/grub.conf=
&quot;,</div><div>=A0=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =
=A0 &quot;/grub/menu.lst&quot;, &quot;/grub/grub.conf&quot;]) + \</div>
<div>=A0=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0map(lambda x: (x,gru=
b.GrubConf.Grub2ConfigFile),</div><div>- =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =
=A0 =A0 =A0 =A0 =A0 [&quot;/boot/grub/grub.cfg&quot;])</div><div>+ =A0 =A0 =
=A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 =A0 [&quot;/boot/grub/grub.cfg&quot=
;,&quot;/grub/grub.cfg&quot;])</div>
<div><br></div><div>=A0=A0 =A0 =A0 =A0 if not fs:</div><div>=A0=A0 =A0 =A0 =
=A0 =A0 =A0 # set the config file and parse it</div><div><br></div>

--001485f3bd5c90bd350481096448--


--===============1991633291==
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

--===============1991633291==--