From: Michael Young <m.a.young@durham.ac.uk>
Date: Tue, 25 Oct 2011 18:18:49 +0000 (+0100)
Subject: pygrub: look in /boot/grub2 (for eg Fedora 16)
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=f2fac180512f14843125fa365a8d11b1ad31b4cb;p=xen.git

pygrub: look in /boot/grub2 (for eg Fedora 16)

Fedora 16 puts grub configuration files in /boot/grub2/grub.cfg so
pygrub should look there as well

Signed-off-by: Michael Young <m.a.young@durham.ac.uk>
Acked-by: Ian Campbell <ian.campbell@citrix.com>
---

diff --git a/tools/pygrub/src/pygrub b/tools/pygrub/src/pygrub
index 4dc42f7f3a..5815e0ee7e 100644
--- a/tools/pygrub/src/pygrub
+++ b/tools/pygrub/src/pygrub
@@ -395,7 +395,8 @@ class Grub:
                            ["/efi/boot/elilo.conf", "/elilo.conf",])
         else:
             cfg_list = map(lambda x: (x,grub.GrubConf.Grub2ConfigFile),
-                           ["/boot/grub/grub.cfg", "/grub/grub.cfg"]) + \
+                           ["/boot/grub/grub.cfg", "/grub/grub.cfg",
+                            "/boot/grub2/grub.cfg", "/grub2/grub.cfg"]) + \
                        map(lambda x: (x,grub.ExtLinuxConf.ExtLinuxConfigFile),
                            ["/boot/isolinux/isolinux.cfg",
                             "/boot/extlinux.conf"]) + \