aboutsummaryrefslogtreecommitdiffstats
path: root/tools/pygrub
diff options
context:
space:
mode:
authorMichael Young <m.a.young@durham.ac.uk>2011-10-25 19:18:49 +0100
committerMichael Young <m.a.young@durham.ac.uk>2011-10-25 19:18:49 +0100
commitf2fac180512f14843125fa365a8d11b1ad31b4cb (patch)
tree0b1aee769672bcd19aaa3ba8638e85a50aa58fbd /tools/pygrub
parent66b1787ae57c27be62f31902e4d5d510610b8dc6 (diff)
downloadxen-f2fac180512f14843125fa365a8d11b1ad31b4cb.tar.gz
xen-f2fac180512f14843125fa365a8d11b1ad31b4cb.tar.bz2
xen-f2fac180512f14843125fa365a8d11b1ad31b4cb.zip
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>
Diffstat (limited to 'tools/pygrub')
-rw-r--r--tools/pygrub/src/pygrub3
1 files changed, 2 insertions, 1 deletions
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"]) + \