27 lines
1.2 KiB
Diff
27 lines
1.2 KiB
Diff
|
# HG changeset patch
|
||
|
|
# User Michael Young <m.a.young@durham.ac.uk>
|
||
|
|
# Date 1319566729 -3600
|
||
|
|
# Node ID 138f707fa598340749a70a79748b01dff850b8f2
|
||
|
|
# Parent 85d7b207fabcd1cbda8f93e3937c5990f42a2cf9
|
||
|
|
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 -r 85d7b207fabc -r 138f707fa598 tools/pygrub/src/pygrub
|
||
|
|
--- a/tools/pygrub/src/pygrub Tue Oct 25 19:15:54 2011 +0100
|
||
|
|
+++ b/tools/pygrub/src/pygrub Tue Oct 25 19:18:49 2011 +0100
|
||
|
|
@@ -395,7 +395,8 @@
|
||
|
|
["/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"]) + \
|