[Xen-changelog] [xen-4.1-testing] pygrub: look in /boot/grub2 (for eg Fedora 16)

[Xen patchbot-4.1-testing <patchbot@xxxxxxx>]

# HG changeset patch
# User Michael Young <m.a.young@xxxxxxxxxxxx>
# Date 1326215278 0
# Node ID d581b9a3c726e03792dd60d8a6fb392b697f18a9
# Parent  ee80c2ef9400276a8dcff4f1cf58f5dc983ba1ac
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@xxxxxxxxxxxx>
Acked-by: Ian Campbell <ian.campbell@xxxxxxxxxx>

xen-unstable changeset: 23999:138f707fa598
Backport-requested-by: Pasi Karkkainen <pasik@xxxxxx>
Committed-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
---


diff -r ee80c2ef9400 -r d581b9a3c726 tools/pygrub/src/pygrub
--- a/tools/pygrub/src/pygrub   Tue Jan 10 17:05:02 2012 +0000
+++ b/tools/pygrub/src/pygrub   Tue Jan 10 17:07:58 2012 +0000
@@ -398,7 +398,8 @@
                            ["/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", "/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"])

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