Disabled isohybrid MBR production on request of H. Peter Anvin
This commit is contained in:
parent
d60e2d79ca
commit
af30d86501
@ -9,7 +9,7 @@
|
||||
.\" First parameter, NAME, should be all caps
|
||||
.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
|
||||
.\" other parameters are allowed: see man(7), man(1)
|
||||
.TH XORRISO 1 "Mar 17, 2010"
|
||||
.TH XORRISO 1 "Mar 18, 2010"
|
||||
.\" Please adjust this date whenever revising the manpage.
|
||||
.\"
|
||||
.\" Some roff macros, for reference:
|
||||
@ -380,11 +380,6 @@ Emulation -as mkisofs supports the example options out of the ISOLINUX wiki.
|
||||
.br
|
||||
The support for other boot image types is sparse.
|
||||
.br
|
||||
An MBR is generated together with the El Torito boot record if the boot image
|
||||
bears the isohybrid signature of ISOLINUX 3.72 or later. It will occupy the
|
||||
first 512 bytes of the emerging ISO image and enable booting from media which
|
||||
appear as hard disk rather than as CDROM. An MBR does not hamper CDROM booting.
|
||||
The MBR of a follow-up session can get in effect only on overwriteable media.
|
||||
.PP
|
||||
\fBACL\fR
|
||||
are an advanced way of controlling access permissions to file objects. Neither
|
||||
@ -2134,8 +2129,8 @@ Most safe is the default: -boot_image "any" "discard".
|
||||
.br
|
||||
|
||||
A bootspec is a word of the form name=value and is used to describe the
|
||||
activation of a ISOLINUX boot image by an El Torito record and eventually
|
||||
a MBR. The names "dir" and "bin_path" lead to boot image activation.
|
||||
activation of a ISOLINUX boot image by an El Torito record.
|
||||
The names "dir" and "bin_path" lead to boot image activation.
|
||||
.br
|
||||
On all media types this is possible within the first session. In further
|
||||
sessions an existing boot image can get replaced by a new one, but depending
|
||||
@ -2165,10 +2160,6 @@ cat_path at -commit time.
|
||||
It is subject to normal -overwrite and -reassure processing if there is already
|
||||
a file with the same name.
|
||||
.br
|
||||
Bootspec "isohybrid=off" disables MBR generation, "isohybrid=on" prevents the
|
||||
write session if not the isohybrid signature is found in the bin_path file.
|
||||
Default is "isohybrid=auto" which silently omits the MBR if the signature is
|
||||
missing.
|
||||
.TP
|
||||
.B Character sets:
|
||||
.PP
|
||||
@ -3036,8 +3027,6 @@ same name and hardcoded argument "on", e.g. -acl "on".
|
||||
Explicit arguments are expected by --stdio_sync
|
||||
and --scdbackup_tag.
|
||||
.br
|
||||
Quite special is isolinux_mbr= (see -boot_image isolinux isohybrid=).
|
||||
.br
|
||||
Personalites "\fBxorrisofs\fR", "\fBgenisoimage\fR",
|
||||
and "\fBgenisofs\fR" are aliases for "mkisofs".
|
||||
.br
|
||||
@ -3854,4 +3843,3 @@ Thanks to Andy Polyakov who invented emulated growing,
|
||||
to Derek Foreman and Ben Jansens who once founded libburn.
|
||||
.br
|
||||
Compliments towards Joerg Schilling whose cdrtools served me for ten years.
|
||||
|
||||
|
@ -4837,7 +4837,13 @@ int Xorriso_new(struct XorrisO ** xorriso,char *progname, int flag)
|
||||
m->boot_image_emul= 0;
|
||||
m->boot_image_cat_path[0]= 0;
|
||||
m->boot_image_load_size= 4 * 512; /* hearsay out of libisofs/demo/iso.c */
|
||||
|
||||
#ifdef Xorriso_with_isohybriD
|
||||
m->boot_image_isohybrid= 1;
|
||||
#else
|
||||
m->boot_image_isohybrid= 0;
|
||||
#endif
|
||||
|
||||
m->loaded_boot_bin_lba= 0;
|
||||
m->loaded_boot_cat_path[0]= 0;
|
||||
m->allow_graft_points= 0;
|
||||
@ -6905,6 +6911,8 @@ int Xorriso_status(struct XorrisO *xorriso, char *filter, FILE *fp, int flag)
|
||||
if(!(is_default && no_defaults))
|
||||
Xorriso_status_result(xorriso,filter,fp,flag&2);
|
||||
}
|
||||
|
||||
#ifdef Xorriso_with_isohybriD
|
||||
if(strcmp(form, "isolinux") == 0) {
|
||||
static char modes[4][6]= {"off", "auto", "on", "force"};
|
||||
is_default= (xorriso->boot_image_isohybrid == 1);
|
||||
@ -6913,6 +6921,7 @@ int Xorriso_status(struct XorrisO *xorriso, char *filter, FILE *fp, int flag)
|
||||
if(!(is_default && no_defaults))
|
||||
Xorriso_status_result(xorriso,filter,fp,flag&2);
|
||||
}
|
||||
#endif /* Xorriso_with_isohybriD */
|
||||
|
||||
sprintf(line,"-cd %s\n",
|
||||
(xorriso->wdi[0] ? Text_shellsafe(xorriso->wdi,sfe,0) : "'/'"));
|
||||
@ -11012,7 +11021,9 @@ int Xorriso_genisofs_help(struct XorrisO *xorriso, int flag)
|
||||
" -boot-load-size # Set numbers of load sectors",
|
||||
" -no-emul-boot Boot image is 'no emulation' image",
|
||||
" -boot-info-table Patch boot image with info table",
|
||||
#ifdef Xorriso_with_isohybriD
|
||||
" isolinux_mbr=on|auto|off Control eventual isohybrid MBR generation",
|
||||
#endif
|
||||
" --stdio_sync on|off|number Control forced output to disk files",
|
||||
" -z, -transparent-compression",
|
||||
" Enable transparent compression of files",
|
||||
@ -13629,6 +13640,9 @@ show_status:;
|
||||
}
|
||||
xorriso->boot_image_load_size= num;
|
||||
} else if(strncmp(treatpt, "isohybrid=", 10) == 0) {
|
||||
|
||||
#ifdef Xorriso_with_isohybriD
|
||||
|
||||
if(strcmp(treatpt + 10, "off") == 0)
|
||||
xorriso->boot_image_isohybrid= 0;
|
||||
else if(strcmp(treatpt + 10, "auto") == 0)
|
||||
@ -13648,6 +13662,19 @@ show_status:;
|
||||
return(0);
|
||||
|
||||
}
|
||||
|
||||
#else
|
||||
|
||||
if(strcmp(treatpt + 10, "off") == 0) {
|
||||
xorriso->boot_image_isohybrid= 0;
|
||||
} else {
|
||||
sprintf(xorriso->info_text,
|
||||
"isohybrid MBR generation has been disabled on request of its inventor H. Peter Anvin on 31 Mar 2010");
|
||||
Xorriso_msgs_submit(xorriso, 0, xorriso->info_text, 0, "FAILURE", 0);
|
||||
}
|
||||
|
||||
#endif /* ! Xorriso_with_isohybriD */
|
||||
|
||||
} else
|
||||
was_ok= 0;
|
||||
} else
|
||||
|
@ -338,14 +338,8 @@ xorriso is able to create or maintain an El Torito object which makes
|
||||
such an image bootable. For details see option -boot_image. Emulation
|
||||
-as mkisofs supports the example options out of the ISOLINUX wiki.
|
||||
The support for other boot image types is sparse.
|
||||
An MBR is generated together with the El Torito boot record if the boot
|
||||
image bears the isohybrid signature of ISOLINUX 3.72 or later. It will
|
||||
occupy the first 512 bytes of the emerging ISO image and enable booting
|
||||
from media which appear as hard disk rather than as CDROM. An MBR does
|
||||
not hamper CDROM booting. The MBR of a follow-up session can get in
|
||||
effect only on overwriteable media.
|
||||
|
||||
*ACL* are an advanced way of controlling access permissions to file
|
||||
*ACL* are an advanced way of controlling access permissions to file
|
||||
objects. Neither ISO 9660 nor Rock Ridge specify a way to record ACLs.
|
||||
So libisofs has introduced a standard conformant extension named AAIP
|
||||
for that purpose. It uses this extension if enabled by option *-acl*.
|
||||
@ -1923,8 +1917,8 @@ unless one can assume overwriteable media.
|
||||
|
||||
A bootspec is a word of the form name=value and is used to
|
||||
describe the activation of a ISOLINUX boot image by an El Torito
|
||||
record and eventually a MBR. The names "dir" and "bin_path" lead
|
||||
to boot image activation.
|
||||
record. The names "dir" and "bin_path" lead to boot image
|
||||
activation.
|
||||
On all media types this is possible within the first session. In
|
||||
further sessions an existing boot image can get replaced by a new
|
||||
one, but depending on the media type this may have few effect at
|
||||
@ -1945,10 +1939,6 @@ unless one can assume overwriteable media.
|
||||
with address cat_path at -commit time. It is subject to normal
|
||||
-overwrite and -reassure processing if there is already a file
|
||||
with the same name.
|
||||
Bootspec "isohybrid=off" disables MBR generation, "isohybrid=on"
|
||||
prevents the write session if not the isohybrid signature is found
|
||||
in the bin_path file. Default is "isohybrid=auto" which silently
|
||||
omits the MBR if the signature is missing.
|
||||
|
||||
|
||||
File: xorriso.info, Node: Charset, Next: Exception, Prev: Bootable, Up: Options
|
||||
@ -2737,8 +2727,6 @@ programs trigger comparable actions.
|
||||
xorriso options with the same name and hardcoded argument "on",
|
||||
e.g. -acl "on". Explicit arguments are expected by --stdio_sync
|
||||
and --scdbackup_tag.
|
||||
Quite special is isolinux_mbr= (see -boot_image isolinux
|
||||
isohybrid=).
|
||||
Personalites "*xorrisofs*", "*genisoimage*", and "*genisofs*" are
|
||||
aliases for "mkisofs".
|
||||
If xorriso is started with one of the leafnames "xorrisofs",
|
||||
@ -3624,7 +3612,7 @@ File: xorriso.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: Top
|
||||
* -out_charset sets output character set: SetWrite. (line 95)
|
||||
* -outdev aquires a drive for output: AqDrive. (line 29)
|
||||
* -overwrite enables overwriting in ISO: SetInsert. (line 127)
|
||||
* -pacifier controls pacifier text form: Emulation. (line 94)
|
||||
* -pacifier controls pacifier text form: Emulation. (line 92)
|
||||
* -padding sets amount of image padding: SetWrite. (line 178)
|
||||
* -page set terminal geometry: DialogCtl. (line 15)
|
||||
* -paste_in copies file into disk file: Restore. (line 117)
|
||||
@ -3651,7 +3639,7 @@ File: xorriso.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: Top
|
||||
* -rollback discards pending changes: Writing. (line 9)
|
||||
* -rollback_end ends program without writing: Scripting. (line 125)
|
||||
* -rom_toc_scan searches for sessions: Loading. (line 189)
|
||||
* -scdbackup_tag enables scdbackup checksum tag: Emulation. (line 104)
|
||||
* -scdbackup_tag enables scdbackup checksum tag: Emulation. (line 102)
|
||||
* -scsi_log reports SCSI commands: Scripting. (line 113)
|
||||
* -session_log logs written sessions: Scripting. (line 104)
|
||||
* -session_string composes session info line: Inquiry. (line 56)
|
||||
@ -3695,7 +3683,7 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top
|
||||
|