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

Reporting grub2_mbr= with -status -boot_image

Browse Source
This commit is contained in:
Thomas Schmitt
2013-04-14 17:46:29 +00:00
parent a2afe4092b
commit a5bc372c6e
3 changed files with 38 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
xorriso/iso_img.c
View File

@ -581,8 +581,6 @@ int Xorriso_boot_image_status(struct XorrisO *xorriso, char *filter, FILE *fp,
if(ret < 0) /* == 0 is normal */
{ret= 0; goto ex;}
/* >>> GRUB2 et.al. : report about system_area_disk_path */
if(xorriso->boot_count == 0 && xorriso->boot_image_bin_path[0] == 0) {
no_image:;
if(xorriso->patch_isolinux_image & 1) {
@ -1177,10 +1175,8 @@ int Xorriso_coordinate_system_area(struct XorrisO *xorriso, int sa_type,
"MBR", "MIPS Big Endian Volume Header", "MIPS Little Endian Boot Block",
"SUN Disk Label"};
/* >>> GRUB2: Take into respect GRUB2 patched MBR */;
old_type= (xorriso->system_area_options & 0xfc) >> 2;
old_options= xorriso->system_area_options & ~0xfc;
old_options= xorriso->system_area_options & ~0x40fc;
if((old_type != 0 || old_options != 0) &&
(old_type != sa_type || (old_options != 0 && old_options != options))) {
sprintf(xorriso->info_text, "%s : First sector already occupied by %s",
@ -1192,7 +1188,8 @@ int Xorriso_coordinate_system_area(struct XorrisO *xorriso, int sa_type,
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0);
goto hint_revoke;
}
xorriso->system_area_options= ((sa_type << 2) & 0xfc) | (options & ~0xfc);
xorriso->system_area_options= (xorriso->system_area_options & 0x4000) |
((sa_type << 2) & 0xfc) | (options & ~0x40fc);
if(sa_type == 0)
xorriso->patch_system_area= xorriso->system_area_options;
return(1);