From mboxrd@z Thu Jan  1 00:00:00 1970
From: Samuel Thibault <samuel.thibault@eu.citrix.com>
Subject: [PATCH] PVM guests and p[yv]grub and the extra=
	parameter
Date: Wed, 16 Jul 2008 12:24:17 +0100
Message-ID: <20080716112417.GI4715@implementation.uk.xensource.com>
References: <20080716012804.GH5288@implementation>
	<20080715221833578.00000080236@djm-pc>
Mime-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Return-path: <xen-devel-bounces@lists.xensource.com>
Content-Disposition: inline
In-Reply-To: <20080715221833578.00000080236@djm-pc>
List-Unsubscribe: <http://lists.xensource.com/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/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: Dan Magenheimer <dan.magenheimer@oracle.com>
Cc: "Xen-Devel (E-mail)" <xen-devel@lists.xensource.com>
List-Id: xen-devel@lists.xenproject.org

PV-GRUB: allow passing menu.lst as a ramdisk

Signed-off-by: Samuel Thibault <samuel.thibault@eu.citrix.com>

diff -r 530efcde6203 stubdom/grub/mini-os.c
--- a/stubdom/grub/mini-os.c	Wed Jul 16 10:43:33 2008 +0100
+++ b/stubdom/grub/mini-os.c	Wed Jul 16 12:24:02 2008 +0100
@@ -681,7 +681,9 @@
         config_file[sizeof(config_file) - 1] = 0;
         if (!strncmp(config_file, "(nd)", 4))
             preset_menu = "dhcp";
-    } else
+    } else if (start_info.mod_len)
+        preset_menu = (void*) start_info.mod_start;
+    else
         preset_menu = "dhcp --with-configfile";
 
     mbi.drives_addr = BOOTSEC_LOCATION + (60 * 1024);