From mboxrd@z Thu Jan  1 00:00:00 1970
From: Aron Griffis <aron@hp.com>
Subject: [PATCH] pygrub: look harder for elilo.conf
Date: Wed, 2 May 2007 22:42:44 -0400
Message-ID: <20070503024240.GA8126@fc.hp.com>
Mime-Version: 1.0
Content-Type: text/plain; charset=utf-8
Return-path: <xen-devel-bounces@lists.xensource.com>
Content-Disposition: inline
List-Unsubscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=unsubscribe>
List-Post: <mailto:xen-devel@lists.xensource.com>
List-Help: <mailto:xen-devel-request@lists.xensource.com?subject=help>
List-Subscribe: <http://lists.xensource.com/cgi-bin/mailman/listinfo/xen-devel>,
	<mailto:xen-devel-request@lists.xensource.com?subject=subscribe>
Sender: xen-devel-bounces@lists.xensource.com
Errors-To: xen-devel-bounces@lists.xensource.com
To: keir@xensource.com
Cc: xen-devel@lists.xensource.com, xen-ia64-devel@lists.xensource.com
List-Id: xen-devel@lists.xenproject.org

Keir,

This would also be appropriate for 3.1.0, since the /usr/lib fix makes
pygrub work on ia64

Presently pygrub only looks in /efi/redhat/elilo.conf.  It should
check for other distributions, plus a couple fallback locations.

Signed-off-by: Aron Griffis <aron@hp.com>

diff -r 6d64f9eefad5 -r 67df28389f46 tools/pygrub/src/pygrub
--- a/tools/pygrub/src/pygrub	Wed May 02 14:50:56 2007 -0400
+++ b/tools/pygrub/src/pygrub	Wed May 02 22:39:12 2007 -0400
@@ -361,7 +361,12 @@ class Grub:
 
         if platform.machine() == 'ia64':
             self.cf = grub.LiloConf.LiloConfigFile()
-            file_list = ("/efi/redhat/elilo.conf",)
+            # common distributions
+            file_list = ("/efi/debian/elilo.conf", "/efi/gentoo/elilo.conf", 
+                         "/efi/redflag/elilo.conf", "/efi/redhat/elilo.conf", 
+                         "/efi/SuSE/elilo.conf",)
+            # fallbacks
+            file_list += ("/efi/boot/elilo.conf", "/elilo.conf",)
         else:
             self.cf = grub.GrubConf.GrubConfigFile()
             file_list = ("/boot/grub/menu.lst", "/boot/grub/grub.conf",