From cf5cc0aa312a163acbccdaa525cf332d2bc7f363 Mon Sep 17 00:00:00 2001 From: Ian Campbell Date: Fri, 15 Jul 2011 18:12:55 +0100 Subject: 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 Acked-by: Ian Jackson Committed-by: Ian Jackson --- tools/pygrub/src/pygrub | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'tools/pygrub') diff --git a/tools/pygrub/src/pygrub b/tools/pygrub/src/pygrub index 843118534a..52b18237cc 100644 --- a/tools/pygrub/src/pygrub +++ b/tools/pygrub/src/pygrub @@ -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 -- cgit v1.2.3