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

Accept partition interval strings of type "imported_iso" for multi-session

Browse Source
This commit is contained in:
Thomas Schmitt 2017-08-24 12:24:59 +02:00
parent e74b04a1e7
commit 047b8db7ac
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
xorriso/write_run.c
View File

@ -864,6 +864,7 @@ int Xorriso_make_iso_write_opts(struct XorrisO *xorriso, IsoImage *image,
struct isoburn_imgen_opts *sopts, int flag) struct isoburn_imgen_opts *sopts, int flag)
{ {
int ext, i, ret, pad_by_libisofs= 0, is_bootable= 0, relax, intvl_string= 0; int ext, i, ret, pad_by_libisofs= 0, is_bootable= 0, relax, intvl_string= 0;
int intvl_check= 2; /* 3 forbids "imported_iso" */
char *out_cs, *part_image; char *out_cs, *part_image;
IsoNode *root_node; IsoNode *root_node;
uint32_t padding; uint32_t padding;
@ -926,7 +927,7 @@ int Xorriso_make_iso_write_opts(struct XorrisO *xorriso, IsoImage *image,
xorriso->scdbackup_tag_written); xorriso->scdbackup_tag_written);
if(xorriso->prep_partition[0]) { if(xorriso->prep_partition[0]) {
part_image= xorriso->prep_partition; part_image= xorriso->prep_partition;
intvl_string= Xorriso_check_intvl_string(xorriso, &part_image, 3); intvl_string= Xorriso_check_intvl_string(xorriso, &part_image, intvl_check);
if(intvl_string < 0) if(intvl_string < 0)
{ret= 0; goto ex;} {ret= 0; goto ex;}
ret= isoburn_igopt_set_prep_partition(sopts, part_image, intvl_string); ret= isoburn_igopt_set_prep_partition(sopts, part_image, intvl_string);
@ -935,7 +936,7 @@ int Xorriso_make_iso_write_opts(struct XorrisO *xorriso, IsoImage *image,
} }
if(xorriso->efi_boot_partition[0]) { if(xorriso->efi_boot_partition[0]) {
part_image= xorriso->efi_boot_partition; part_image= xorriso->efi_boot_partition;
intvl_string= Xorriso_check_intvl_string(xorriso, &part_image, 3); intvl_string= Xorriso_check_intvl_string(xorriso, &part_image, intvl_check);
if(intvl_string < 0) if(intvl_string < 0)
{ret= 0; goto ex;} {ret= 0; goto ex;}
ret= isoburn_igopt_set_efi_bootp(sopts, part_image, intvl_string); ret= isoburn_igopt_set_efi_bootp(sopts, part_image, intvl_string);
@ -951,7 +952,7 @@ int Xorriso_make_iso_write_opts(struct XorrisO *xorriso, IsoImage *image,
part_image= ""; part_image= "";
else else
part_image= xorriso->appended_partitions[i]; part_image= xorriso->appended_partitions[i];
intvl_string= Xorriso_check_intvl_string(xorriso, &part_image, 3); intvl_string= Xorriso_check_intvl_string(xorriso, &part_image, intvl_check);
if(intvl_string < 0) if(intvl_string < 0)
{ret= 0; goto ex;} {ret= 0; goto ex;}
isoburn_igopt_set_partition_img(sopts, i + 1, isoburn_igopt_set_partition_img(sopts, i + 1,

2
xorriso/xorriso_timestamp.h
View File

@ -1 +1 @@
#define Xorriso_timestamP "2017.08.24.102256" #define Xorriso_timestamP "2017.08.24.102427"