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

2009-12-21 Robert Millan <rmh.grub@aybabtu.com>

Browse source 
* util/mkisofs/mkisofs.c (use_embedded_boot, boot_image_embed): New
        variables.
        (ld_options, main): Recognize `--embedded-boot'.
        * util/mkisofs/mkisofs.h (use_embedded_boot, boot_image_embed): New
        declarations.
        * util/mkisofs/write.c (PADBLOCK_SIZE): New variable.
        (padblock_size): Use `PADBLOCK_SIZE' instead of hardcoding 16.
        (padblock_write): Likewise.  Rewrite to support embedded boot image.

        * util/grub-mkrescue.in: When building i386-pc images, embed core.img
        for BIOS-based disk boot instead of only ElTorito.
This commit is contained in:
Robert Millan 2009-12-21 17:40:26 +00:00
parent b15937b110
commit 0ae5692966
5 changed files with 74 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

23
util/mkisofs/write.c
View file

@ -1344,6 +1344,9 @@ int FDECL1(oneblock_size, int, starting_extent)
/*
* Functions to describe padding block at the start of the disc.
*/
#define PADBLOCK_SIZE 16
static int FDECL1(pathtab_size, int, starting_extent)
{
path_table[0] = starting_extent;
@ -1357,7 +1360,7 @@ static int FDECL1(pathtab_size, int, starting_extent)
static int FDECL1(padblock_size, int, starting_extent)
{
last_extent += 16;
last_extent += PADBLOCK_SIZE;
return 0;
}
@ -1420,17 +1423,23 @@ static int FDECL1(dirtree_cleanup, FILE *, outfile)
static int FDECL1(padblock_write, FILE *, outfile)
{
char buffer[2048];
int i;
char *buffer;
int i;
memset(buffer, 0, sizeof(buffer));
buffer = e_malloc (2048 * PADBLOCK_SIZE);
memset (buffer, 0, 2048 * PADBLOCK_SIZE);
for(i=0; i<16; i++)
if (use_embedded_boot)
{
xfwrite(buffer, 1, sizeof(buffer), outfile);
FILE *fp = fopen (boot_image_embed, "rb");
if (! fp)
error (1, errno, _("Unable to open %s"), boot_image_embed);
fread (buffer, 2048 * PADBLOCK_SIZE, 1, fp);
}
last_extent_written += 16;
xfwrite (buffer, 1, 2048 * PADBLOCK_SIZE, outfile);
last_extent_written += PADBLOCK_SIZE;
return 0;
}