Browse Source

Let ISO size cover appended partitions if --protective-msdos-label or nonzero -partition_offset is given

release-1.5.4.branch
Thomas Schmitt 4 years ago
parent
commit
18ab6019bc
  1. 12
      libisofs/eltorito.c
  2. 8
      libisofs/system_area.c

12
libisofs/eltorito.c

@ -1505,18 +1505,6 @@ int eltorito_writer_create(Ecma119Image *target)
target->catalog->bootimages[idx]->appended_start;
target->boot_intvl_size[idx] =
target->catalog->bootimages[idx]->appended_size;
/* >>> ??? Why only with appended partition as El Torito image ?
Can this be used in all cases of appended partitions ?
*/
if ((((target->system_area_options >> 2) & 0x3f) == 0 &&
(target->system_area_options & 3) == 1) ||
target->opts->partition_offset > 0) {
/* Protective MBR || partition offset */
/* ISO will not be a partition. It can span the whole image. */
target->pvd_size_is_total_size = 1;
}
continue;
}

8
libisofs/system_area.c

@ -2153,6 +2153,14 @@ int iso_write_system_area(Ecma119Image *t, uint8_t *buf)
}
}
if ((((t->system_area_options >> 2) & 0x3f) == 0 &&
(t->system_area_options & 3) == 1) ||
t->opts->partition_offset > 0) {
/* Protective MBR || partition offset */
/* ISO will not be a partition. It can span the whole image. */
t->pvd_size_is_total_size = 1;
}
return ISO_SUCCESS;
}

Loading…
Cancel
Save