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

Correcterd criterion for enabling CHRP partition entry.

Browse Source
This commit is contained in:
Thomas Schmitt 2012-06-12 21:58:55 +02:00
parent c166a49889
commit 3a60720099
2 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
libisofs/ecma119.c
View File

@ -2082,6 +2082,9 @@ int ecma119_image_new(IsoImage *src, IsoWriteOpts *opts, Ecma119Image **img)
goto target_cleanup; goto target_cleanup;
#endif /* ! Libisofs_gpt_writer_lasT */ #endif /* ! Libisofs_gpt_writer_lasT */
/* >>> Should not the checksum writer come before the zero writer ? */
/* IMPORTANT: This must be the last writer before the checksum writer */ /* IMPORTANT: This must be the last writer before the checksum writer */
ret = zero_writer_create(target, target->tail_blocks, 1); ret = zero_writer_create(target, target->tail_blocks, 1);
if (ret < 0) if (ret < 0)

3
libisofs/system_area.c
View File

@ -2030,8 +2030,7 @@ static int partprepend_writer_compute_data_blocks(IsoImageWriter *writer)
t->curblock += t->efi_boot_part_size; t->curblock += t->efi_boot_part_size;
} }
if ((((t->system_area_options >> 10) & 0xf) == 1) && if ((t->system_area_options & 0x3cff) == 0x0400) {
((t->system_area_options >> 2) & 0x3f) == 0) {
/* CHRP is not compatible with any other partition in MBR */ /* CHRP is not compatible with any other partition in MBR */
if (t->prep_partition != NULL || t->fat || will_have_gpt || if (t->prep_partition != NULL || t->fat || will_have_gpt ||
t->mbr_req_count > 0) t->mbr_req_count > 0)