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

Fix mismerge resulting in ghost multiboot module. Reported by: Grégoire Sutre.

Browse source
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-01-18 16:03:57 +01:00
parent 935842dd56
commit 1ef7e2992d
1 changed files with 0 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
loader/i386/multiboot.c
View file

@ -303,11 +303,6 @@ grub_module (int argc, char *argv[])
if (err) if (err)
goto fail; goto fail;
err = grub_multiboot_add_module ((grub_addr_t) module, size,
argc - 1, argv + 1);
if (err)
goto fail;
if (grub_file_read (file, module, size) != size) if (grub_file_read (file, module, size) != size)
{ {
grub_error (GRUB_ERR_FILE_READ_ERROR, "couldn't read file"); grub_error (GRUB_ERR_FILE_READ_ERROR, "couldn't read file");