mirror of
https://github.com/xen-project/xen.git
synced 2026-10-29 18:50:05 +01:00
pygrub: prefer Grub2 to Grub1
If a VM image has grub2 installed it is likely the one we need to be using. Signed-off-by: Ian Campbell <ian.campbell@citrix.com> Acked-by: Ian Jackson <ian.jackson@eu.citrix.com> Committed-by: Ian Jackson <ian.jackson@eu.citrix.com>
This commit is contained in:
Ian Campbell committed
1 parent
22771413fb
commit
cf5cc0aa31
1 file changed
+5
-5
@@ -385,14 +385,14 @@ class Grub:
|
||||
# fallbacks
|
||||
["/efi/boot/elilo.conf", "/elilo.conf",])
|
||||
else:
|
||||
cfg_list = map(lambda x: (x,grub.GrubConf.GrubConfigFile),
|
||||
["/boot/grub/menu.lst", "/boot/grub/grub.conf",
|
||||
"/grub/menu.lst", "/grub/grub.conf"]) + \
|
||||
map(lambda x: (x,grub.GrubConf.Grub2ConfigFile),
|
||||
cfg_list = map(lambda x: (x,grub.GrubConf.Grub2ConfigFile),
|
||||
["/boot/grub/grub.cfg", "/grub/grub.cfg"]) + \
|
||||
map(lambda x: (x,grub.ExtLinuxConf.ExtLinuxConfigFile),
|
||||
["/boot/isolinux/isolinux.cfg",
|
||||
"/boot/extlinux.conf"])
|
||||
"/boot/extlinux.conf"]) + \
|
||||
map(lambda x: (x,grub.GrubConf.GrubConfigFile),
|
||||
["/boot/grub/menu.lst", "/boot/grub/grub.conf",
|
||||
"/grub/menu.lst", "/grub/grub.conf"])
|
||||
|
||||
if not fs:
|
||||
# set the config file and parse it
|
||||
|
||||