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

Putting user defined padding after appended partitions

Browse Source
This commit is contained in:
Thomas Schmitt 2018-06-04 09:35:01 +02:00
parent 848e039e6d
commit f39d4eefee
4 changed files with 197 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

171
libisofs/ecma119.c
View File

@ -1188,6 +1188,13 @@ int tail_writer_compute_data_blocks(IsoImageWriter *writer)
{ {
int ret; int ret;
Ecma119Image *target; Ecma119Image *target;
#ifdef Libisofs_part_align_writeR
target = writer->target;
#else
struct iso_zero_writer_data_struct *data; struct iso_zero_writer_data_struct *data;
char msg[80]; char msg[80];
@ -1202,21 +1209,57 @@ int tail_writer_compute_data_blocks(IsoImageWriter *writer)
iso_msgs_submit(0, msg, 0, "NOTE", 0); iso_msgs_submit(0, msg, 0, "NOTE", 0);
data->num_blocks = target->opts->tail_blocks; data->num_blocks = target->opts->tail_blocks;
} }
#endif /* ! Libisofs_part_align_writeR */
if (target->opts->tail_blocks <= 0) if (target->opts->tail_blocks <= 0)
return ISO_SUCCESS; return ISO_SUCCESS;
ret = zero_writer_compute_data_blocks(writer); ret = zero_writer_compute_data_blocks(writer);
return ret; return ret;
} }
static
int part_align_writer_compute_data_blocks(IsoImageWriter *writer)
{
int ret;
Ecma119Image *target;
struct iso_zero_writer_data_struct *data;
char msg[80];
target = writer->target;
/* Default setting in case no alignment is needed */
target->alignment_end_block = target->curblock;
ret = iso_align_isohybrid(target, 0);
if (ret < 0)
return ret;
data = (struct iso_zero_writer_data_struct *) writer->data;
if (target->part_align_blocks != 0) {
sprintf(msg, "Aligned image size to cylinder size by %d blocks",
target->part_align_blocks);
iso_msgs_submit(0, msg, 0, "NOTE", 0);
data->num_blocks = target->part_align_blocks;
}
if (target->part_align_blocks <= 0)
return ISO_SUCCESS;
ret = zero_writer_compute_data_blocks(writer);
target->alignment_end_block = target->curblock;
return ret;
}
/* /*
@param flag bit0= use tail_writer_compute_data_blocks rather than @param flag bit0-3= compute_data_blocks mode:
zero_writer_compute_data_blocks 0= zero_writer_compute_data_blocks
1= tail_writer_compute_data_blocks
2= part_align_writer_compute_data_blocks
*/ */
static static
int zero_writer_create(Ecma119Image *target, uint32_t num_blocks, int flag) int zero_writer_create(Ecma119Image *target, uint32_t num_blocks, int flag)
{ {
IsoImageWriter *writer; IsoImageWriter *writer;
struct iso_zero_writer_data_struct *data; struct iso_zero_writer_data_struct *data;
int mode;
writer = malloc(sizeof(IsoImageWriter)); writer = malloc(sizeof(IsoImageWriter));
if (writer == NULL) { if (writer == NULL) {
@ -1229,8 +1272,11 @@ int zero_writer_create(Ecma119Image *target, uint32_t num_blocks, int flag)
} }
data->num_blocks = num_blocks; data->num_blocks = num_blocks;
if (flag & 1) { mode = (flag & 15);
if (mode == 1) {
writer->compute_data_blocks = tail_writer_compute_data_blocks; writer->compute_data_blocks = tail_writer_compute_data_blocks;
} else if (mode == 2) {
writer->compute_data_blocks = part_align_writer_compute_data_blocks;
} else { } else {
writer->compute_data_blocks = zero_writer_compute_data_blocks; writer->compute_data_blocks = zero_writer_compute_data_blocks;
} }
@ -2132,7 +2178,7 @@ void *write_function(void *arg)
{ {
int res, i; int res, i;
#ifndef Libisofs_appended_partitions_inlinE #ifndef Libisofs_appended_partitions_inlinE
int first_partition = 1, last_partition = 0, sa_type; int first_partition = 1, last_partition = 0;
#endif #endif
IsoImageWriter *writer; IsoImageWriter *writer;
@ -2161,14 +2207,7 @@ void *write_function(void *arg)
#ifndef Libisofs_appended_partitions_inlinE #ifndef Libisofs_appended_partitions_inlinE
/* Append partition data */ /* Append partition data */
sa_type = (target->system_area_options >> 2) & 0x3f; iso_count_appended_partitions(target, &first_partition, &last_partition);
if (sa_type == 0) { /* MBR */
first_partition = 1;
last_partition = 4;
} else if (sa_type == 3) { /* SUN Disk Label */
first_partition = 2;
last_partition = 8;
}
for (i = first_partition - 1; i <= last_partition - 1; i++) { for (i = first_partition - 1; i <= last_partition - 1; i++) {
if (target->opts->appended_partitions[i] == NULL) if (target->opts->appended_partitions[i] == NULL)
continue; continue;
@ -2450,6 +2489,10 @@ int ecma119_image_new(IsoImage *src, IsoWriteOpts *in_opts, Ecma119Image **img)
uint32_t vol_space_size_mem; uint32_t vol_space_size_mem;
off_t total_size_mem; off_t total_size_mem;
#ifdef Libisofs_appended_partitions_inlinE
int fap, lap, app_part_count;
#endif
/* 1. Allocate target and attach a copy of in_opts there */ /* 1. Allocate target and attach a copy of in_opts there */
target = calloc(1, sizeof(Ecma119Image)); target = calloc(1, sizeof(Ecma119Image));
if (target == NULL) { if (target == NULL) {
@ -2643,6 +2686,8 @@ int ecma119_image_new(IsoImage *src, IsoWriteOpts *in_opts, Ecma119Image **img)
target->wthread_is_running = 0; target->wthread_is_running = 0;
target->part_align_blocks = 0;
target->alignment_end_block = 0;
target->post_iso_part_pad = 0; target->post_iso_part_pad = 0;
target->prep_part_size = 0; target->prep_part_size = 0;
target->efi_boot_part_size = 0; target->efi_boot_part_size = 0;
@ -2741,6 +2786,12 @@ int ecma119_image_new(IsoImage *src, IsoWriteOpts *in_opts, Ecma119Image **img)
nwriters+= 2; nwriters+= 2;
} }
#ifdef Libisofs_part_align_writeR
nwriters++; /* part_align_blocks writer */
#endif
#ifdef Libisofs_appended_partitions_inlinE #ifdef Libisofs_appended_partitions_inlinE
nwriters++; /* Inline Partition Append Writer */ nwriters++; /* Inline Partition Append Writer */
@ -2867,34 +2918,26 @@ int ecma119_image_new(IsoImage *src, IsoWriteOpts *in_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 ?
*/
#define Libisofs_checksums_before_paddinG yes
#ifndef Libisofs_checksums_before_paddinG
/* >>> ??? Why is this important ? */
/* IMPORTANT: This must be the last writer before the checksum writer */
ret = zero_writer_create(target, opts->tail_blocks, 1);
if (ret < 0)
goto target_cleanup;
#endif /* !Libisofs_checksums_before_paddinG */
if ((opts->md5_file_checksums & 1) || opts->md5_session_checksum) { if ((opts->md5_file_checksums & 1) || opts->md5_session_checksum) {
ret = checksum_writer_create(target); ret = checksum_writer_create(target);
if (ret < 0) if (ret < 0)
goto target_cleanup; goto target_cleanup;
} }
#ifdef Libisofs_checksums_before_paddinG
#ifdef Libisofs_part_align_writeR
/* Alignment padding before appended partitions */
ret = zero_writer_create(target, 0, 2);
#else
ret = zero_writer_create(target, opts->tail_blocks, 1); ret = zero_writer_create(target, opts->tail_blocks, 1);
#endif /* ! Libisofs_part_align_writeR */
if (ret < 0) if (ret < 0)
goto target_cleanup; goto target_cleanup;
#endif /* Libisofs_checksums_before_paddinG */
#ifdef Libisofs_appended_partitions_inlinE #ifdef Libisofs_appended_partitions_inlinE
ret = partappend_writer_create(target); ret = partappend_writer_create(target);
@ -2903,9 +2946,18 @@ int ecma119_image_new(IsoImage *src, IsoWriteOpts *in_opts, Ecma119Image **img)
#endif /* Libisofs_appended_partitions_inlinE */ #endif /* Libisofs_appended_partitions_inlinE */
#ifdef Libisofs_part_align_writeR
ret = zero_writer_create(target, opts->tail_blocks, 0);
if (ret < 0)
goto target_cleanup;
#endif /* Libisofs_part_align_writeR */
#ifdef Libisofs_gpt_writer_lasT #ifdef Libisofs_gpt_writer_lasT
/* This writer shall be the last one in the list, because it protects the /* This writer shall be the last one in the list of writers of valuable
image on media which are seen as GPT partitioned. data, because it protects the image on media which are seen as GPT
partitioned.
In any case it has to come after any writer which might request In any case it has to come after any writer which might request
production of APM or GPT partition entries by its compute_data_blocks() production of APM or GPT partition entries by its compute_data_blocks()
method. method.
@ -2989,13 +3041,6 @@ int ecma119_image_new(IsoImage *src, IsoWriteOpts *in_opts, Ecma119Image **img)
goto target_cleanup; goto target_cleanup;
} }
#ifdef Libisofs_appended_partitions_inlinE
target->vol_space_size = target->curblock - opts->ms_block;
target->total_size = (off_t) target->vol_space_size * BLOCK_SIZE;
#endif
} }
ret = iso_patch_eltoritos(target); ret = iso_patch_eltoritos(target);
@ -3007,12 +3052,24 @@ int ecma119_image_new(IsoImage *src, IsoWriteOpts *in_opts, Ecma119Image **img)
goto target_cleanup; goto target_cleanup;
} }
#ifndef Libisofs_appended_partitions_inlinE
/* /*
* The volume space size is just the size of the last session, in * The volume space size is just the size of the last session, in
* case of ms images. * case of ms images.
*/ */
#ifdef Libisofs_appended_partitions_inlinE
app_part_count = iso_count_appended_partitions(target, &fap, &lap);
if (app_part_count == 0)
target->vol_space_size = target->curblock - opts->ms_block;
else
target->vol_space_size = target->alignment_end_block - opts->ms_block;
target->total_size = (off_t) (target->curblock - opts->ms_block) *
BLOCK_SIZE;
#else /* Libisofs_appended_partitions_inlinE */
target->vol_space_size = target->curblock - opts->ms_block; target->vol_space_size = target->curblock - opts->ms_block;
target->total_size = (off_t) target->vol_space_size * BLOCK_SIZE; target->total_size = (off_t) target->vol_space_size * BLOCK_SIZE;
@ -3299,11 +3356,6 @@ int bs_set_size(struct burn_source *bs, off_t size)
{ {
Ecma119Image *target = (Ecma119Image*)bs->data; Ecma119Image *target = (Ecma119Image*)bs->data;
/*
* just set the value to be returned by get_size. This is not used at
* all by libisofs, it is here just for helping libburn to correctly pad
* the image if needed.
*/
target->total_size = size; target->total_size = size;
return 1; return 1;
} }
@ -4545,3 +4597,30 @@ ex: /* LIBISO_ALLOC_MEM failed */
return NULL; return NULL;
} }
/* Obtains start and end number of appended partition range and returns
the number of valid entries in the list of appended partitions.
*/
int iso_count_appended_partitions(Ecma119Image *target,
int *first_partition, int *last_partition)
{
int sa_type, i, count= 0;
sa_type = (target->system_area_options >> 2) & 0x3f;
if (sa_type == 3) { /* SUN Disk Label */
*first_partition = 2;
*last_partition = 8;
} else {
*first_partition = 1;
*last_partition = 4;
}
for (i = *first_partition - 1; i <= *last_partition - 1; i++) {
if (target->opts->appended_partitions[i] == NULL)
continue;
if (target->opts->appended_partitions[i][0] == 0)
continue;
count++;
}
return(count);
}

11
libisofs/ecma119.h
View File

@ -799,6 +799,11 @@ struct ecma119_image
*/ */
IsoFileSrc *sparc_core_src; IsoFileSrc *sparc_core_src;
/* Trailing padding of ISO filesystem partition for cylinder alignment */
/* Only in effect with Libisofs_part_align_writeR */
uint32_t part_align_blocks;
uint32_t alignment_end_block;
/* Counted in blocks of 2048 */ /* Counted in blocks of 2048 */
uint32_t appended_part_prepad[ISO_MAX_PARTITIONS]; uint32_t appended_part_prepad[ISO_MAX_PARTITIONS];
uint32_t appended_part_start[ISO_MAX_PARTITIONS]; uint32_t appended_part_start[ISO_MAX_PARTITIONS];
@ -1044,6 +1049,10 @@ int iso_interval_reader_start_size(Ecma119Image *t, char *path,
off_t *start_byte, off_t *byte_count, off_t *start_byte, off_t *byte_count,
int flag); int flag);
/* Obtains start and end number of appended partition range and returns
the number of valid entries in the list of appended partitions.
*/
int iso_count_appended_partitions(Ecma119Image *target,
int *first_partition, int *last_partition);
#endif /*LIBISO_ECMA119_H_*/ #endif /*LIBISO_ECMA119_H_*/

56
libisofs/system_area.c
View File

@ -165,7 +165,17 @@ int iso_compute_append_partitions(Ecma119Image *t, int flag)
else else
cyl_size /= 4; cyl_size /= 4;
} }
#ifdef Libisofs_appended_partitions_inlinE
pos = t->curblock;
#else
pos = (t->vol_space_size + t->opts->ms_block); pos = (t->vol_space_size + t->opts->ms_block);
#endif
for (i = 0; i < ISO_MAX_PARTITIONS; i++) { for (i = 0; i < ISO_MAX_PARTITIONS; i++) {
if (t->opts->appended_partitions[i] == NULL) if (t->opts->appended_partitions[i] == NULL)
continue; continue;
@ -1856,7 +1866,12 @@ int iso_write_system_area(Ecma119Image *t, uint8_t *buf)
break; break;
} }
#ifdef Libisofs_appended_partitions_inlinE
img_blocks = t->vol_space_size;
#else
img_blocks = t->curblock; img_blocks = t->curblock;
#endif
if (t->system_area_data != NULL) { if (t->system_area_data != NULL) {
/* Write more or less opaque boot image */ /* Write more or less opaque boot image */
memcpy(buf, t->system_area_data, 16 * BLOCK_SIZE); memcpy(buf, t->system_area_data, 16 * BLOCK_SIZE);
@ -2069,7 +2084,17 @@ int iso_write_system_area(Ecma119Image *t, uint8_t *buf)
/* Adjust partition table to partition offset. /* Adjust partition table to partition offset.
With t->mbr_req_count > 0 this has already been done, With t->mbr_req_count > 0 this has already been done,
*/ */
img_blocks = t->curblock; /* value might be altered */
#ifndef Libisofs_appended_partitions_inlinE
img_blocks = t->curblock; /* value might have been altered */
#else
/* A change of t->curblock does not matter in this case */
#endif
if (part_type == 0xee && t->gpt_req_count > 0) { if (part_type == 0xee && t->gpt_req_count > 0) {
mbrp1_blocks = t->total_size / BLOCK_SIZE + t->opts->ms_block; mbrp1_blocks = t->total_size / BLOCK_SIZE + t->opts->ms_block;
offset_flag |= 2 | 1; /* protective MBR, no other partitions */ offset_flag |= 2 | 1; /* protective MBR, no other partitions */
@ -2223,6 +2248,10 @@ int iso_align_isohybrid(Ecma119Image *t, int flag)
off_t imgsize, cylsize = 0, frac; off_t imgsize, cylsize = 0, frac;
char *msg = NULL; char *msg = NULL;
#ifdef Libisofs_part_align_writeR
int fap, lap, app_part_count;
#endif
LIBISO_ALLOC_MEM(msg, char, 160); LIBISO_ALLOC_MEM(msg, char, 160);
sa_type = (t->system_area_options >> 2) & 0x3f; sa_type = (t->system_area_options >> 2) & 0x3f;
if (sa_type != 0) if (sa_type != 0)
@ -2236,7 +2265,22 @@ int iso_align_isohybrid(Ecma119Image *t, int flag)
goto ex; goto ex;
} }
#ifdef Libisofs_part_align_writeR
/* If partitions get appended then t->opts->tail_blocks and
t->gpt_backup_size come after the alignment padding.
*/
app_part_count = iso_count_appended_partitions(t, &fap, &lap);
img_blocks = t->curblock;
if (app_part_count == 0)
img_blocks += t->opts->tail_blocks + t->gpt_backup_size;
#else
img_blocks = t->curblock + t->opts->tail_blocks + t->gpt_backup_size; img_blocks = t->curblock + t->opts->tail_blocks + t->gpt_backup_size;
#endif
imgsize = ((off_t) img_blocks) * (off_t) 2048; imgsize = ((off_t) img_blocks) * (off_t) 2048;
if ((!(t->opts->appended_as_gpt && t->have_appended_partitions)) if ((!(t->opts->appended_as_gpt && t->have_appended_partitions))
&& ((t->system_area_options & 3) || always_align) && ((t->system_area_options & 3) || always_align)
@ -2315,7 +2359,17 @@ int iso_align_isohybrid(Ecma119Image *t, int flag)
t->post_iso_part_pad); t->post_iso_part_pad);
iso_msgs_submit(0, msg, 0, "WARNING", 0); iso_msgs_submit(0, msg, 0, "WARNING", 0);
} }
#ifdef Libisofs_part_align_writeR
t->part_align_blocks = (frac + 2047) / 2048;
#else
t->opts->tail_blocks += (frac + 2047) / 2048; t->opts->tail_blocks += (frac + 2047) / 2048;
#endif /* ! Libisofs_part_align_writeR */
ret = ISO_SUCCESS; ret = ISO_SUCCESS;
ex:; ex:;
LIBISO_FREE_MEM(msg); LIBISO_FREE_MEM(msg);

10
libisofs/system_area.h
View File

@ -317,9 +317,13 @@ void iso_ascii_utf_16le(uint8_t gap_name[72]);
#define Libisofs_grub2_sparc_patch_size_poS 0x230 #define Libisofs_grub2_sparc_patch_size_poS 0x230
/* >>> It is unclear whether there is a use case for appended partitions /* Put appended partitions into the writer range
inside the ISO filesystem range.
# define Libisofs_appended_partitions_inlinE yes
*/ */
#define Libisofs_appended_partitions_inlinE yes
#ifdef Libisofs_appended_partitions_inlinE
/* For padding after appended partitions (and also after backup GPT)
*/
#define Libisofs_part_align_writeR yes
#endif
#endif /* SYSTEM_AREA_H_ */ #endif /* SYSTEM_AREA_H_ */