vbatts/grub
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Merge my local branch

Browse source
This commit is contained in:
Robert Millan 2009-12-25 12:43:20 +01:00
commit 427d6aa453
9 changed files with 148 additions and 74 deletions
Download patch file Download diff file Expand all files Collapse all files

4
loader/i386/multiboot.c
View file

@ -65,7 +65,7 @@ grub_multiboot_boot (void)
{
struct grub_relocator32_state state =
{
.eax = MULTIBOOT_MAGIC2,
.eax = MULTIBOOT_BOOTLOADER_MAGIC,
.ebx = PTR_TO_UINT32 (mbi_dest),
.ecx = 0,
.edx = 0,
@ -250,7 +250,7 @@ grub_multiboot (int argc, char *argv[])
((char *) header <= buffer + len - 12) || (header = 0);
header = (struct multiboot_header *) ((char *) header + 4))
{
if (header->magic == MULTIBOOT_MAGIC
if (header->magic == MULTIBOOT_HEADER_MAGIC
&& !(header->magic + header->flags + header->checksum))
break;
}