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

New ystem area sub type CHRP with iso_write_opts_set_system_area()

Browse Source
This commit is contained in:
Thomas Schmitt
2012-06-12 21:16:56 +02:00
parent d7401f0a4c
commit 6fc3bb6777
4 changed files with 33 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
libisofs/system_area.c
View File

@ -2008,7 +2008,8 @@ static int partprepend_writer_compute_data_blocks(IsoImageWriter *writer)
return ISO_ASSERT_FAILURE;
t = writer->target;
/* >>> t->chrp_mark */;
if (t->efi_boot_partition != NULL || t->hfsplus || t->gpt_req_count > 0)
will_have_gpt = 1;
if (t->efi_boot_partition != NULL) {
ret = compute_partition_size(t->efi_boot_partition,
@ -2025,8 +2026,18 @@ static int partprepend_writer_compute_data_blocks(IsoImageWriter *writer)
t->curblock += t->efi_boot_part_size;
}
if (t->efi_boot_partition != NULL || t->hfsplus)
will_have_gpt = 1;
if ((((t->system_area_options >> 10) & 0xf) == 1) &&
((t->system_area_options >> 2) & 0x3f) == 0) {
/* CHRP is not compatible with any other partition in MBR */
if (t->prep_partition != NULL || t->fat || will_have_gpt ||
t->mbr_req_count > 0)
return ISO_BOOT_MBR_OVERLAP;
ret = iso_quick_mbr_entry(t, (uint32_t) 0, (uint32_t) 0, 0x96, 0);
if (ret < 0)
return ret;
return ISO_SUCCESS;
}
if (t->prep_partition != NULL) {
ret = compute_partition_size(t->prep_partition, &(t->prep_part_size),
0);