From 619579f87baddecc8601281215f878b57faa0f67 Mon Sep 17 00:00:00 2001 From: "H. Peter Anvin" Date: Sun, 26 Apr 2009 19:52:39 -0700 Subject: mboot: reimplement the Solaris DHCP hack, add compliant a.out mode Reimplement the Solaris DHCP information passing hack. Add a spec-compliant mode for the "a.out kludge". The spec is pretty clear that the bit should override the ELF header (after all, otherwise there wouldn't be any need for the bit), but Grub disagrees. We default to Grub-compliant mode, as Solaris seems to set the bit even though it's an ELF kernel, but add the option to enable spec-compliant mode, as apparently some versions of FreeBSD need it. Signed-off-by: H. Peter Anvin --- com32/mboot/mboot.h | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'com32/mboot/mboot.h') diff --git a/com32/mboot/mboot.h b/com32/mboot/mboot.h index 0f33a511..c05d69f1 100644 --- a/com32/mboot/mboot.h +++ b/com32/mboot/mboot.h @@ -69,6 +69,10 @@ static inline void error(const char *msg) /* mboot.c */ extern struct multiboot_info mbinfo; extern struct syslinux_pm_regs regs; +extern struct my_options { + bool solaris; + bool aout; +} opt; /* map.c */ #define MAP_HIGH 1 @@ -84,4 +88,7 @@ void mboot_make_memmap(void); /* apm.c */ void mboot_apm(void); +/* solaris.c */ +void mboot_solaris_dhcp_hack(void); + #endif /* MBOOT_H */ -- cgit v1.2.1