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

Enabled recognition of partition offset of grub-mkrescue-sed.sh mode "gpt_appended"

Browse Source
This commit is contained in:
Thomas Schmitt 2016-12-25 15:46:11 +01:00
parent afb10aac3b
commit 3043b5f660
1 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
libisofs/fs_image.c
View File

@ -3905,10 +3905,12 @@ try_grub2_mbr:;
static static
int iso_analyze_partition_offset(IsoImage *image, IsoDataSource *src, int iso_analyze_partition_offset(IsoImage *image, IsoDataSource *src,
uint64_t start_block, int flag) uint64_t start_block, uint64_t block_count,
int flag)
{ {
int ret; int ret;
uint8_t *buf = NULL; uint8_t *buf = NULL;
uint32_t iso_size;
off_t p_offset; off_t p_offset;
struct ecma119_pri_vol_desc *pvm; struct ecma119_pri_vol_desc *pvm;
struct iso_imported_sys_area *sai; struct iso_imported_sys_area *sai;
@ -3921,11 +3923,14 @@ int iso_analyze_partition_offset(IsoImage *image, IsoDataSource *src,
ret = src->read_block(src, p_offset + 16, buf); ret = src->read_block(src, p_offset + 16, buf);
if (ret > 0) { if (ret > 0) {
pvm = (struct ecma119_pri_vol_desc *) buf; pvm = (struct ecma119_pri_vol_desc *) buf;
iso_size = iso_read_lsb(pvm->vol_space_size, 4);
if (strncmp((char*) pvm->std_identifier, "CD001", 5) == 0 && if (strncmp((char*) pvm->std_identifier, "CD001", 5) == 0 &&
pvm->vol_desc_type[0] == 1 && pvm->vol_desc_type[0] == 1 &&
pvm->vol_desc_version[0] == 1 && pvm->vol_desc_version[0] == 1 &&
pvm->file_structure_version[0] == 1 && pvm->file_structure_version[0] == 1 &&
iso_read_lsb(pvm->vol_space_size, 4) + p_offset == sai->image_size) (iso_size + p_offset == sai->image_size ||
iso_size == block_count / 4))
sai->partition_offset = p_offset; sai->partition_offset = p_offset;
} }
ret = 1; ret = 1;
@ -4037,7 +4042,7 @@ int iso_analyze_mbr(IsoImage *image, IsoDataSource *src, int flag)
(part->start_block + part->block_count) / 4 == sai->image_size) { (part->start_block + part->block_count) / 4 == sai->image_size) {
ret = iso_analyze_partition_offset(image, src, part->start_block, ret = iso_analyze_partition_offset(image, src, part->start_block,
0); part->block_count, 0);
if (ret < 0) if (ret < 0)
goto ex; goto ex;
} }
@ -4342,10 +4347,10 @@ int iso_analyze_gpt(IsoImage *image, IsoDataSource *src, int flag)
block_count = sai->gpt_req[0]->block_count; block_count = sai->gpt_req[0]->block_count;
if (start_block >= 64 && block_count >= 72 && if (start_block >= 64 && block_count >= 72 &&
start_block <= 2048 && start_block % 4 == 0 && start_block <= 2048 && start_block % 4 == 0 &&
block_count % 4 == 0 && block_count % 4 == 0) {
(start_block + block_count) / 4 == sai->image_size) {
ret = iso_analyze_partition_offset(image, src, start_block, 0); ret = iso_analyze_partition_offset(image, src, start_block,
block_count, 0);
if (ret < 0) if (ret < 0)
return ret; return ret;
} }