search for: mbinfo

Set a pointer to syslinux_version()->version_string in mbinfo. Signed-off-by: Sebastian Herbszt <herbszt at gmx.de> diff --git a/com32/mboot/mboot.c b/com32/mboot/mboot.c index 8425e06..76ef7a0 100644 --- a/com32/mboot/mboot.c +++ b/com32/mboot/mboot.c @@ -222,6 +222,13 @@ int main(int argc, char *argv[]) /* Add auxilliary information */ mbo...

...Align this, but don't pad -- in general this means a bunch of + * smaller sections gets packed into a single page. + */ + addr = map_data(sh64, len, 4096, MAP_HIGH | MAP_NOPAD); + if (!addr) { + error("Failed to map symbol table\n"); + return NULL; + } + + mbinfo.flags |= MB_INFO_ELF_SHDR; + mbinfo.syms.e.addr = addr; + mbinfo.syms.e.num = eh64->e_shnum; + mbinfo.syms.e.size = eh64->e_shentsize; + mbinfo.syms.e.shndx = eh64->e_shstrndx; + + for (i = 0; i < eh64->e_shnum; i++) { + addr_t align; + + if (!sh64[i].sh_size) +...

...boot/mboot.c @@ -224,6 +224,14 @@ int main(int argc, char *argv[]) mboot_apm(); mboot_syslinux_info(); + /* Set boot device info */ + const union syslinux_derivative_info *sdi; + sdi = syslinux_derivative_info(); + if (sdi->c.filesystem != SYSLINUX_FS_PXELINUX) { + mbinfo.boot_device = (sdi->disk.drive_number << 24) | 0xffffff; + mbinfo.flags |= MB_INFO_BOOTDEV; + } + if (opt.solaris) mboot_solaris_dhcp_hack();

...efine AT_IGNORE 1 /* entry should be ignored */ #define AT_EXECFD 2 /* file descriptor of program */ diff --git a/com32/mboot/mboot.c b/com32/mboot/mboot.c index 10e6701..4e6b4e1 100644 --- a/com32/mboot/mboot.c +++ b/com32/mboot/mboot.c @@ -223,13 +223,13 @@ int main(int argc, char *argv[]) mbinfo.flags |= MB_INFO_CMDLINE; } - /* Map auxilliary images */ + /* Map auxiliary images */ if (nmodules > 1) { if (map_modules(modules + 1, nmodules - 1)) return 1; } - /* Add auxilliary information */ + /* Add auxiliary information */ mboot_make_memmap();...