Re: [PATCH] Guest boot loader support

[aq <aquynh@gmail.com>]

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

On 4/27/05, Hollis Blanchard <hollisb@us.ibm.com> wrote:
> Mark Williamson wrote:
> >>ok, i see the point.
> >>
> >>other question: pygrub::get_config(fn) tries to read
> >>"/boot/grub/grub.conf". Normally this should be "/boot/grub/menu.lst".
> >>I wonder which distro are you working on?
> >
> > My FC3 box has menu.lst as a symlink to grub.conf.  Grub seems to be happy
> > with either of these names.  Painful experience suggests that if both files
> > are present, then "menu.lst" will "win".
> 
> 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, so here is a quick patch to fix the "/boot/grub/grub.conf"
problem. Please apply this after applying the last Jeremy's patch.

list of changes:
- make a dummy file tools/pygrub/src/__init__.py
- open and parse /boot/grub/menu.lst instead of /boot/grub/grub.conf

$ diffstat xen-bootloader.aq.patch 
 __init__.py |    1 +
 pygrub      |    7 +++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

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

[-- Attachment #2: xen-bootloader.aq.patch --]
[-- Type: application/octet-stream, Size: 1245 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:43:48.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,10 @@ def get_config(fn):
             break
 
     if fs is not None:
-        f = fs.open_file("/boot/grub/grub.conf")
+        if not os.path.isfile("/boot/grub/menu.lst"):
+            raise RuntimeError, "we cannot find /boot/grub/menu.lst" + \
+                                "in the image provided. halt!"
+        f = fs.open_file("/boot/grub/menu.lst")
         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