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

* util/grub-setup.c (setup): Don't clean blocklists before readability

Browse source 
verfification.
This commit is contained in:
Vladimir 'phcoder' Serbinenko 2010-10-17 00:25:23 +02:00
parent 27d9ee3253
commit f77a8c2470
2 changed files with 17 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
ChangeLog
View file

@ -1,3 +1,8 @@
2010-10-17 Vladimir Serbinenko <phcoder@gmail.com>
* util/grub-setup.c (setup): Don't clean blocklists before readability
verfification.
2010-10-16 Vladimir Serbinenko <phcoder@gmail.com> 2010-10-16 Vladimir Serbinenko <phcoder@gmail.com>
* docs/grub.texi (Installation): Document embedding zone. Remove * docs/grub.texi (Installation): Document embedding zone. Remove

24
util/grub-setup.c
View file

@ -319,18 +319,6 @@ setup (const char *dir,
} }
#endif #endif
/* Clean out the blocklists. */
block = first_block;
while (block->len)
{
grub_memset (block, 0, sizeof (block));
block--;
if ((char *) block <= core_img)
grub_util_error ("No terminator in the core image");
}
#ifdef GRUB_MACHINE_PCBIOS #ifdef GRUB_MACHINE_PCBIOS
{ {
grub_partition_map_t dest_partmap = NULL; grub_partition_map_t dest_partmap = NULL;
@ -434,6 +422,18 @@ setup (const char *dir,
goto unable_to_embed; goto unable_to_embed;
} }
/* Clean out the blocklists. */
block = first_block;
while (block->len)
{
grub_memset (block, 0, sizeof (block));
block--;
if ((char *) block <= core_img)
grub_util_error ("No terminator in the core image");
}
save_first_sector (sectors[0] + grub_partition_get_start (container), save_first_sector (sectors[0] + grub_partition_get_start (container),
0, GRUB_DISK_SECTOR_SIZE); 0, GRUB_DISK_SECTOR_SIZE);