xcp-1.6-updates/xen-4.1.hg

changeset 23209:d581b9a3c726

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>

xen-unstable changeset: 23999:138f707fa598
Backport-requested-by: Pasi Karkkainen <pasik@iki.fi>
Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
author Michael Young <m.a.young@durham.ac.uk>
date Tue Jan 10 17:07:58 2012 +0000 (2012-01-10)
parents ee80c2ef9400
children feb23d232cd9
files tools/pygrub/src/pygrub
line diff
     1.1 --- a/tools/pygrub/src/pygrub	Tue Jan 10 17:05:02 2012 +0000
     1.2 +++ b/tools/pygrub/src/pygrub	Tue Jan 10 17:07:58 2012 +0000
     1.3 @@ -398,7 +398,8 @@ class Grub:
     1.4                             ["/boot/grub/menu.lst", "/boot/grub/grub.conf",
     1.5                              "/grub/menu.lst", "/grub/grub.conf"]) + \
     1.6                         map(lambda x: (x,grub.GrubConf.Grub2ConfigFile),
     1.7 -                           ["/boot/grub/grub.cfg", "/grub/grub.cfg"]) + \
     1.8 +                           ["/boot/grub/grub.cfg", "/grub/grub.cfg",
     1.9 +                            "/boot/grub2/grub.cfg", "/grub2/grub.cfg"]) + \
    1.10                         map(lambda x: (x,grub.ExtLinuxConf.ExtLinuxConfigFile),
    1.11                             ["/boot/isolinux/isolinux.cfg",
    1.12                              "/boot/extlinux.conf"])