[Xen-changelog] [xen-3.4-testing] pygrub: Fix grub2 support when config is on a separate /boot partition

["Xen patchbot-3.4-testing" <patchbot-3.4-testing@xxxxxxxxxxxxxxxxxxx>]

# HG changeset patch
# User Keir Fraser <keir.fraser@xxxxxxxxxx>
# Date 1268158137 0
# Node ID 351b79a183c91c061e92550019f0eee106f270f8
# Parent  14704aeaeec80d246c448bd4668a4ed2b02f181c
pygrub: Fix grub2 support when config is on a separate /boot partition

Signed-off-by: David Markey <david@xxxxxxxxxxx>
Acked-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
xen-unstable changeset:   21002:87ed57b6e4cd
xen-unstable date:        Fri Mar 05 14:39:25 2010 +0000
---
 tools/pygrub/src/pygrub |    2 +-
 1 files changed, 1 insertion(+), 1 deletion(-)

diff -r 14704aeaeec8 -r 351b79a183c9 tools/pygrub/src/pygrub
--- a/tools/pygrub/src/pygrub   Tue Mar 09 18:05:29 2010 +0000
+++ b/tools/pygrub/src/pygrub   Tue Mar 09 18:08:57 2010 +0000
@@ -383,7 +383,7 @@ class Grub:
                            ["/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

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog