Re: [PATCH] Guest boot loader support

[aq <aquynh@gmail.com>]

[-- Attachment #1: Type: text/plain, Size: 1056 bytes --]

On 4/27/05, Mark Williamson <mark.williamson@cl.cam.ac.uk> wrote:
> > GRUB only looks for menu.lst; distros create symlinks because that's a
> > terrible name for a config file. In other words, no code should be
> > opening grub.conf...
> 
> OK, I've investigated this using my sacrificial FC3 laptop ;-)  I'd not fully
> investigated this before.
> 
> Redhat's grub looks for grub.conf and not menu.lst.  Standard grub looks for
> menu.lst.
> 
> If the loader is to be flexible for different domU distros, it'd be nice to
> look for both, in one order or the other.
> 

in that case, this patch is better for you, Mark ;-). Please apply
this on top of Jeremy's patch.

list of changes:
- make a dummy file tools/pygrub/src/__init__.py
- tools/src/pygrub looks for either /boot/grub/menu.lst or
/boot/grub/grub.conf, in that order.

$ diffstat xen-bootloader.aq2.patch 
 __init__.py |    1 +
 pygrub      |   11 +++++++++--
 2 files changed, 10 insertions(+), 2 deletions(-)

Signed-off-by: Nguyen Anh Quynh <aquynh@gmail.com>

[-- Attachment #2: xen-bootloader.aq2.patch --]
[-- Type: application/octet-stream, Size: 1403 bytes --]

diff -Nurp xen-unstable.27.3.org/tools/pygrub/src/__init__.py xen-unstable.27.3/tools/pygrub/src/__init__.py
--- xen-unstable.27.3.org/tools/pygrub/src/__init__.py	1970-01-01 09:00:00.000000000 +0900
+++ xen-unstable.27.3/tools/pygrub/src/__init__.py	2005-04-27 04:50:12.000000000 +0900
@@ -0,0 +1 @@
+ 
diff -Nurp xen-unstable.27.3.org/tools/pygrub/src/pygrub xen-unstable.27.3/tools/pygrub/src/pygrub
--- xen-unstable.27.3.org/tools/pygrub/src/pygrub	2005-04-27 05:32:43.000000000 +0900
+++ xen-unstable.27.3/tools/pygrub/src/pygrub	2005-04-27 05:57:43.000000000 +0900
@@ -13,7 +13,7 @@
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 #
 
-import os, sys, string, struct, tempfile
+import os, os.path, sys, string, struct, tempfile
 import logging
 
 import curses, _curses, curses.wrapper
@@ -97,7 +97,14 @@ def get_config(fn):
             break
 
     if fs is not None:
-        f = fs.open_file("/boot/grub/grub.conf")
+        if os.path.isfile("/boot/grub/menu.lst"):
+            grubfile = "/boot/grub/menu.lst"
+        elif os.path.isfile("/boot/grub/grub.conf"):
+            grubfile = "/boot/grub/grub.conf"
+        else:
+            raise RuntimeError, "we cannot find /boot/grub/{menu.lst,grub.conf} " + \
+                                "in the image provided. halt!"
+        f = fs.open_file(grubfile)
         buf = f.read()
         f.close()
         fs.close()

[-- Attachment #3: Type: text/plain, Size: 138 bytes --]

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