Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
L
libisoburn
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Commits
Issue Boards
Open sidebar
Libburnia
libisoburn
Commits
2f24d82e
Commit
2f24d82e
authored
Apr 09, 2017
by
Thomas Schmitt
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Avoiding to recognize real GPT as -part_like_isohybrid
parent
9a3869f6
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
15 additions
and
7 deletions
+15
-7
iso_img.c
xorriso/iso_img.c
+14
-6
xorriso_timestamp.h
xorriso/xorriso_timestamp.h
+1
-1
No files found.
xorriso/iso_img.c
View file @
2f24d82e
...
...
@@ -1912,7 +1912,7 @@ static int Xorriso_scan_report_lines(struct XorrisO *xorriso,
}
else
if
(
strcmp
(
name
,
"GPT start and size :"
)
==
0
)
{
idx
=
num
[
0
]
-
1
;
if
(
img_blocks
<=
num
[
1
]
&&
num
[
2
]
>
0
)
if
(
num
[
2
]
>
0
)
appended_as_gpt
=
1
;
gpts
[
idx
].
start_block
=
num
[
1
];
gpts
[
idx
].
block_count
=
num
[
2
];
...
...
@@ -2059,8 +2059,8 @@ static int Xorriso_scan_report_lines(struct XorrisO *xorriso,
Xorriso_add_intvl_adr
(
xorriso
,
buf
,
(
uint64_t
)
start_block
,
((
uint64_t
)
start_block
)
+
num_blocks
-
1
,
"d"
,
imported_iso
);
}
else
if
((
part_status
&
0x80
)
&&
part_type
==
0x00
&&
start_block
==
0
&&
num_blocks
==
1
)
{
}
else
if
((
part_status
&
0x80
)
&&
part_type
==
0x00
&&
start_block
==
0
&&
num_blocks
==
1
)
{
if
(
mkisofs
)
sprintf
(
buf
,
"--mbr-force-bootable"
);
else
...
...
@@ -2157,12 +2157,20 @@ static int Xorriso_scan_report_lines(struct XorrisO *xorriso,
Xorriso_add_intvl_adr
(
xorriso
,
buf
,
(
uint64_t
)
num
[
1
],
(
uint64_t
)
(
num
[
1
]
+
num
[
2
]
-
1
.
0
),
"d"
,
imported_iso
);
Xorriso_record_cmd_linE
buf
[
0
]
=
0
;
appended_partition
=
1
;
}
ret
=
Xorriso_search_eltorito_lba
(
xorriso
,
et_imgs
,
elto_count
,
(
unsigned
int
)
(
num
[
1
]
/
4
.
0
),
&
et_idx
,
0
);
/* Check for isohybri-ish MBR and GPT mix */
if
(
mbr_count
==
1
&&
mbrpts
[
0
].
ptype
==
0xee
&&
have_protective_msdos
)
{
/* real GPT is not -part_like_isohybrid */
ret
=
0
;
}
else
{
ret
=
Xorriso_search_eltorito_lba
(
xorriso
,
et_imgs
,
elto_count
,
(
unsigned
int
)
(
num
[
1
]
/
4
.
0
),
&
et_idx
,
0
);
}
if
(
ret
>
0
)
{
if
(
!
(
et_imgs
[
et_idx
].
do_gpt_basdat
||
et_imgs
[
et_idx
].
do_gpt_hfsplus
||
...
...
xorriso/xorriso_timestamp.h
View file @
2f24d82e
#define Xorriso_timestamP "2017.0
2.27.094332
"
#define Xorriso_timestamP "2017.0
4.09.175231
"
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment