[PATCH] pygrub: look harder for elilo.conf

[PATCH] pygrub: look harder for elilo.conf

[Aron Griffis]

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",

Re: [PATCH] pygrub: look harder for elilo.conf

[Daniel P. Berrange]

On Wed, May 02, 2007 at 10:42:44PM -0400, Aron Griffis wrote:
> 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",)

How about simply having it iterate over every first level subdirectory of /efi,
ie basically looking for  /efi/*/elilo.conf  rather than hardcoding a small
list of distros ?

Regards,
Dan.
-- 
|=- Red Hat, Engineering, Emerging Technologies, Boston.  +1 978 392 2496 -=|
|=-           Perl modules: http://search.cpan.org/~danberr/              -=|
|=-               Projects: http://freshmeat.net/~danielpb/               -=|
|=-  GnuPG: 7D3B9505   F3C9 553F A1DA 4AC2 5648 23C1 B3DF F742 7D3B 9505  -=| 

Re: [PATCH] pygrub: look harder for elilo.conf

[Alex Williamson]

On Thu, 2007-05-03 at 04:48 +0100, Daniel P. Berrange wrote:
> On Wed, May 02, 2007 at 10:42:44PM -0400, Aron Griffis wrote:
> >  
> >          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",)
> 
> How about simply having it iterate over every first level subdirectory of /efi,
> ie basically looking for  /efi/*/elilo.conf  rather than hardcoding a small
> list of distros ?

   I think Aron looked into it briefly, but it wasn't clear how to do
that in libfsimage.  If it can be done, that certainly sounds like less
maintenance.  Thanks,

	Alex

-- 
Alex Williamson                             HP Open Source & Linux Org.

Re: [PATCH] pygrub: look harder for elilo.conf

[John Levon]

On Wed, May 02, 2007 at 09:53:20PM -0600, Alex Williamson wrote:

> On Thu, 2007-05-03 at 04:48 +0100, Daniel P. Berrange wrote:
> > On Wed, May 02, 2007 at 10:42:44PM -0400, Aron Griffis wrote:
> > >  
> > >          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",)
> > 
> > How about simply having it iterate over every first level subdirectory of /efi,
> > ie basically looking for  /efi/*/elilo.conf  rather than hardcoding a small
> > list of distros ?
> 
>    I think Aron looked into it briefly, but it wasn't clear how to do
> that in libfsimage.  If it can be done, that certainly sounds like less
> maintenance.  Thanks,

There is no way yet to iterate directory entries, since it's not been
needed yet. You could do it, but you'd have to add new code to every FS
backend, so it wouldn't be fun.

regards
john