projects
/
xen.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
66b1787
)
pygrub: look in /boot/grub2 (for eg Fedora 16)
author
Michael Young
<m.a.young@durham.ac.uk>
Tue, 25 Oct 2011 18:18:49 +0000
(19:18 +0100)
committer
Michael Young
<m.a.young@durham.ac.uk>
Tue, 25 Oct 2011 18:18:49 +0000
(19:18 +0100)
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>
tools/pygrub/src/pygrub
patch
|
blob
|
history
diff --git
a/tools/pygrub/src/pygrub
b/tools/pygrub/src/pygrub
index 4dc42f7f3a46f4ca7f91f944d578ac5b99bf174c..5815e0ee7e0312c995ee1d9e4b87041848b18ff4 100644
(file)
--- 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"]) + \