From: Keir Fraser <keir.fraser@citrix.com>
Date: Wed, 16 Jul 2008 12:50:47 +0000 (+0100)
Subject: PV-GRUB: allow passing menu.lst as a ramdisk
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~14188^2~7
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=4ad705ff7d3003330926d3d614539a7217f84e33;p=xen.git

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

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

diff --git a/stubdom/grub/mini-os.c b/stubdom/grub/mini-os.c
index 49e1f21f86..ecb1191ab7 100644
--- a/stubdom/grub/mini-os.c
+++ b/stubdom/grub/mini-os.c
@@ -681,7 +681,9 @@ int main(int argc, char *argv[])
         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);