xen-changelog

[Top] [All Lists]

[Xen-changelog] [xen-unstable] pygrub: prefer Grub2 to Grub1

from [Xen patchbot-unstable]

[Permanent Link][Original]

To:	xen-changelog@xxxxxxxxxxxxxxxxxxx
Subject:	[Xen-changelog] [xen-unstable] pygrub: prefer Grub2 to Grub1
From:	Xen patchbot-unstable <patchbot@xxxxxxx>
Date:	Sun, 17 Jul 2011 12:55:09 +0100
Delivery-date:	Sun, 17 Jul 2011 04:55:23 -0700
Envelope-to:	www-data@xxxxxxxxxxxxxxxxxxx
List-help:	<mailto:xen-changelog-request@lists.xensource.com?subject=help>
List-id:	BK change log <xen-changelog.lists.xensource.com>
List-post:	<mailto:xen-changelog@lists.xensource.com>
List-subscribe:	<http://lists.xensource.com/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=subscribe>
List-unsubscribe:	<http://lists.xensource.com/mailman/listinfo/xen-changelog>, <mailto:xen-changelog-request@lists.xensource.com?subject=unsubscribe>
Reply-to:	xen-devel@xxxxxxxxxxxxxxxxxxx
Sender:	xen-changelog-bounces@xxxxxxxxxxxxxxxxxxx

# HG changeset patch
# User Ian Campbell <ian.campbell@xxxxxxxxxx>
# Date 1310749975 -3600
# Node ID 5e1032229546c2d5640dc05205303d91d78a92c3
# Parent  c1d7fa123dae73708da7306c0ec611d6fa6a6140
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@xxxxxxxxxx>
Acked-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
Committed-by: Ian Jackson <ian.jackson@xxxxxxxxxxxxx>
---


diff -r c1d7fa123dae -r 5e1032229546 tools/pygrub/src/pygrub
--- a/tools/pygrub/src/pygrub   Fri Jul 15 18:09:49 2011 +0100
+++ b/tools/pygrub/src/pygrub   Fri Jul 15 18:12:55 2011 +0100
@@ -385,14 +385,14 @@
                            # 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

_______________________________________________
Xen-changelog mailing list
Xen-changelog@xxxxxxxxxxxxxxxxxxx
http://lists.xensource.com/xen-changelog

[More with this subject...]

<Prev in Thread]	Current Thread	[Next in Thread>
[Xen-changelog] [xen-unstable] pygrub: prefer Grub2 to Grub1, Xen patchbot-unstable <=

Previous by Date:	[Xen-changelog] [xen-unstable] xenbackendd: fix mistaken treatment of unknown backend (eg console) as VIF/VBD, Xen patchbot-unstable
Next by Date:	[Xen-changelog] [xen-unstable] xl: log domain suspension., Xen patchbot-unstable
Previous by Thread:	[Xen-changelog] [xen-unstable] xenbackendd: fix mistaken treatment of unknown backend (eg console) as VIF/VBD, Xen patchbot-unstable
Next by Thread:	[Xen-changelog] [xen-unstable] xl: log domain suspension., Xen patchbot-unstable
Indexes:	[Date] [Thread] [Top] [All Lists]