libburnia/libisofs
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Described need to pad isohybrid to full MB.

Browse Source 
Removed compiler warning about isohybrid FIXME.
This commit is contained in:
Thomas Schmitt 2008-11-25 16:32:55 +01:00
parent 412ad2fcdb
commit 23e2647920
2 changed files with 15 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
libisofs/libisofs.h
View File

@ -1935,14 +1935,16 @@ void el_torito_patch_isolinux_image(ElToritoBootImage *bootimg);
* bitmask style flag. The following values are defined: * bitmask style flag. The following values are defined:
* *
* bit 0 -> 1 to path the image, 0 to not * bit 0 -> 1 to path the image, 0 to not
* Patching the image involves the writting of a 56 bytes * Patching the image involves the writing of a 56 bytes
* boot information table at offset 8 of the boot image file. * boot information table at offset 8 of the boot image file.
* The original boot image file won't be modified. This is needed * The original boot image file will not be modified. This is
* to allow isolinux images to be bootable. * needed to allow isolinux images to be bootable.
* bit 1 -> 1 to generate an hybrid image, 0 to not * bit 1 -> 1 to generate an hybrid image with MBR, 0 to not
* An hybrid image is a boot image that boots from either CD/DVD * An hybrid image is a boot image that boots from either
* media or from USB sticks. For that, you should use an isolinux * CD/DVD media or from disk-like media, e.g. USB stick.
* image that supports hybrid mode. Recent images support this. * For that you need isolinux.bin from SYSLINUX 3.72 or later.
* IMPORTANT: The application has to take care that the image
* on media gets padded up to the next full MB.
* @param flag * @param flag
* Reserved for future usage, set to 0. * Reserved for future usage, set to 0.
* @return * @return

6
libisofs/system_area.c
View File

@ -48,7 +48,13 @@ int iso_write_system_area(Ecma119Image *t, uint8_t *buf)
img_blocks = t->curblock; img_blocks = t->curblock;
ret = make_isohybrid_mbr(t->bootimg->sections[0].block, &img_blocks, (char*)buf, 0); ret = make_isohybrid_mbr(t->bootimg->sections[0].block, &img_blocks, (char*)buf, 0);
/*
API description of el_torito_set_isolinux_options() prescribes
to pad to full MB.
So this is not urgent any more :
// FIXME the new img_blocks size should be taken into account // FIXME the new img_blocks size should be taken into account
*/
if (ret != 1) { if (ret != 1) {
/* error, it should never happen */ /* error, it should never happen */