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

* util/grub-mkimage.c (generate_image): Clean multiboot header to avoid

Browse source 
confusing ipxe.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2011-12-15 20:29:30 +01:00
parent e5f4d2607a
commit 70ffcc93ee
2 changed files with 19 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2011-12-15 Vladimir Serbinenko <phcoder@gmail.com>
* util/grub-mkimage.c (generate_image): Clean multiboot header to avoid
confusing ipxe.
2011-12-15 Vladimir Serbinenko <phcoder@gmail.com> 2011-12-15 Vladimir Serbinenko <phcoder@gmail.com>
* grub-core/lib/libgcrypt/cipher/md4.c (transform) [WORDS_BIGENDIAN]: * grub-core/lib/libgcrypt/cipher/md4.c (transform) [WORDS_BIGENDIAN]:

14
util/grub-mkimage.c
View file

@ -32,6 +32,7 @@
#include <grub/crypto.h> #include <grub/crypto.h>
#include <grub/dl.h> #include <grub/dl.h>
#include <time.h> #include <time.h>
#include <multiboot.h>
#include <stdio.h> #include <stdio.h>
#include <unistd.h> #include <unistd.h>
@ -971,6 +972,7 @@ generate_image (const char *dir, char *prefix, FILE *out, char *mods[],
{ {
char *pxeboot_path, *pxeboot_img; char *pxeboot_path, *pxeboot_img;
size_t pxeboot_size; size_t pxeboot_size;
grub_uint32_t *ptr;
pxeboot_path = grub_util_get_path (dir, "pxeboot.img"); pxeboot_path = grub_util_get_path (dir, "pxeboot.img");
pxeboot_size = grub_util_get_image_size (pxeboot_path); pxeboot_size = grub_util_get_image_size (pxeboot_path);
@ -979,6 +981,18 @@ generate_image (const char *dir, char *prefix, FILE *out, char *mods[],
grub_util_write_image (pxeboot_img, pxeboot_size, out); grub_util_write_image (pxeboot_img, pxeboot_size, out);
free (pxeboot_img); free (pxeboot_img);
free (pxeboot_path); free (pxeboot_path);
/* Remove Multiboot header to avoid confusing ipxe. */
for (ptr = (grub_uint32_t *) core_img;
ptr < (grub_uint32_t *) (core_img + MULTIBOOT_SEARCH); ptr++)
if (*ptr == grub_host_to_target32 (MULTIBOOT_HEADER_MAGIC)
&& grub_target_to_host32 (ptr[0])
+ grub_target_to_host32 (ptr[1])
+ grub_target_to_host32 (ptr[2]) == 0)
{
*ptr = 0;
break;
}
} }
boot_path = grub_util_get_path (dir, "diskboot.img"); boot_path = grub_util_get_path (dir, "diskboot.img");