aboutsummaryrefslogtreecommitdiffstats
path: root/com32/mboot/mboot.c
diff options
context:
space:
mode:
authorH. Peter Anvin <hpa@zytor.com>2009-12-22 09:38:43 -0800
committerH. Peter Anvin <hpa@zytor.com>2009-12-22 09:38:43 -0800
commit2b164fd1078bc9640836f15598ed901cc7a31ae2 (patch)
tree05c661adf5920b2408fbd1961b3bd855c75732d8 /com32/mboot/mboot.c
parent8492da661cc77e26cd18e4cf307b78e50661ea29 (diff)
parente535becb865292360e808996409c1513df7d2be7 (diff)
downloadsyslinux-2b164fd1078bc9640836f15598ed901cc7a31ae2.tar.gz
syslinux-2b164fd1078bc9640836f15598ed901cc7a31ae2.tar.xz
syslinux-2b164fd1078bc9640836f15598ed901cc7a31ae2.zip
Merge branch 'master' into fsc
Resolved Conflicts: com32/Makefile com32/lib/sys/open.c com32/modules/Makefile dos/Makefile dos/com16.ld dos/syslinux.c version Signed-off-by: H. Peter Anvin <hpa@zytor.com>
Diffstat (limited to 'com32/mboot/mboot.c')
-rw-r--r--com32/mboot/mboot.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/com32/mboot/mboot.c b/com32/mboot/mboot.c
index 62ebf523..a0b55628 100644
--- a/com32/mboot/mboot.c
+++ b/com32/mboot/mboot.c
@@ -152,6 +152,7 @@ int main(int argc, char *argv[])
{
int nmodules;
struct module_data *modules;
+ struct multiboot_header *mbh;
bool keeppxe = false;
openconsole(&dev_null_r, &dev_stdcon_w);
@@ -193,7 +194,8 @@ int main(int argc, char *argv[])
* Map the primary image. This should be done before mapping anything
* else, since it will have fixed address requirements.
*/
- if (map_image(modules[0].data, modules[0].len))
+ mbh = map_image(modules[0].data, modules[0].len);
+ if (!mbh)
return 1;
/* Map the mbinfo structure */
@@ -223,6 +225,9 @@ int main(int argc, char *argv[])
if (opt.solaris)
mboot_solaris_dhcp_hack();
+ /* Set the graphics mode if requested */
+ set_graphics_mode(mbh, &mbinfo);
+
/* Run it */
mboot_run(keeppxe ? 3 : 0);
error("mboot.c32: boot failed\n");