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

Let -boot_image bin_path= , efi_path= recognize --interval:appended_partition

Browse Source
This commit is contained in:
Thomas Schmitt 2016-01-20 10:41:34 +00:00
parent ed2cf194ba
commit e1f36ebc6d
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
libisoburn/trunk/xorriso/opts_a_c.c
View File

@ -832,10 +832,14 @@ treatment_patch:;
xorriso->boot_image_bin_path[0] = 0; xorriso->boot_image_bin_path[0] = 0;
xorriso->boot_efi_default= 0; xorriso->boot_efi_default= 0;
} else if(strncmp(treatpt, "bin_path=", 9) == 0) { } else if(strncmp(treatpt, "bin_path=", 9) == 0) {
ret= Xorriso_normalize_img_path(xorriso, xorriso->wdi, treatpt + 9, if(strncmp(treatpt + 9, "--interval:appended_partition_", 30) == 0) {
xorriso->boot_image_bin_path, 2); strcpy(xorriso->boot_image_bin_path, treatpt + 9);
if(ret <= 0) } else {
goto ex; ret= Xorriso_normalize_img_path(xorriso, xorriso->wdi, treatpt + 9,
xorriso->boot_image_bin_path, 2);
if(ret <= 0)
goto ex;
}
xorriso->keep_boot_image= 0; xorriso->keep_boot_image= 0;
if(isolinux_grub) { if(isolinux_grub) {
xorriso->patch_isolinux_image= (xorriso->patch_isolinux_image & ~3) | 1; xorriso->patch_isolinux_image= (xorriso->patch_isolinux_image & ~3) | 1;
@ -850,10 +854,14 @@ treatment_patch:;
xorriso->boot_image_bin_path[0] = 0; xorriso->boot_image_bin_path[0] = 0;
xorriso->boot_efi_default= 0; xorriso->boot_efi_default= 0;
} else if(strncmp(treatpt, "efi_path=", 9) == 0) { } else if(strncmp(treatpt, "efi_path=", 9) == 0) {
ret= Xorriso_normalize_img_path(xorriso, xorriso->wdi, treatpt + 9, if(strncmp(treatpt + 9, "--interval:appended_partition_", 30) == 0) {
strcpy(xorriso->boot_image_bin_path, treatpt + 9);
} else {
ret= Xorriso_normalize_img_path(xorriso, xorriso->wdi, treatpt + 9,
xorriso->boot_image_bin_path, 2); xorriso->boot_image_bin_path, 2);
if(ret <= 0) if(ret <= 0)
goto ex; goto ex;
}
xorriso->keep_boot_image= 0; xorriso->keep_boot_image= 0;
xorriso->boot_efi_default= 1; xorriso->boot_efi_default= 1;

2
libisoburn/trunk/xorriso/xorriso_timestamp.h
View File

@ -1 +1 @@
#define Xorriso_timestamP "2016.01.01.172817" #define Xorriso_timestamP "2016.01.20.104201"