diff options
author | Keir Fraser <keir.fraser@citrix.com> | 2008-07-16 13:50:47 +0100 |
---|---|---|
committer | Keir Fraser <keir.fraser@citrix.com> | 2008-07-16 13:50:47 +0100 |
commit | 4ad705ff7d3003330926d3d614539a7217f84e33 (patch) | |
tree | dead9ec16b0f08c1b4f60caa0d6fc3277652ff26 /stubdom/grub | |
parent | b00a73e7c35daffda80940f9ee06f0556f5b6669 (diff) | |
download | xen-4ad705ff7d3003330926d3d614539a7217f84e33.tar.gz xen-4ad705ff7d3003330926d3d614539a7217f84e33.tar.bz2 xen-4ad705ff7d3003330926d3d614539a7217f84e33.zip |
PV-GRUB: allow passing menu.lst as a ramdisk
Signed-off-by: Samuel Thibault <samuel.thibault@eu.citrix.com>
Diffstat (limited to 'stubdom/grub')
-rw-r--r-- | stubdom/grub/mini-os.c | 4 |
1 files changed, 3 insertions, 1 deletions
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); |