diff --git a/xorriso/xorriso.c b/xorriso/xorriso.c index 00300f99..0a932ad7 100644 --- a/xorriso/xorriso.c +++ b/xorriso/xorriso.c @@ -11188,6 +11188,7 @@ int Xorriso_genisofs_help(struct XorrisO *xorriso, int flag) " --protective-msdos-label Patch System Area by partition table", " --modification-date=YYYYMMDDhhmmsscc", " Override modification date", +" -isohybrid-mbr FILE Set SYSLINUX mbr/isohdp[fp]x*.bin for isohybrid", #ifdef Xorriso_with_isohybriD " isolinux_mbr=on|auto|off Control eventual isohybrid MBR generation", #endif diff --git a/xorriso/xorriso.texi b/xorriso/xorriso.texi index 11d317e7..17fe7994 100644 --- a/xorriso/xorriso.texi +++ b/xorriso/xorriso.texi @@ -44,7 +44,7 @@ @c man .\" First parameter, NAME, should be all caps @c man .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection @c man .\" other parameters are allowed: see man(7), man(1) -@c man .TH XORRISO 1 "Apr 08, 2010" +@c man .TH XORRISO 1 "Apr 10, 2010" @c man .\" Please adjust this date whenever revising the manpage. @c man .\" @c man .\" Some roff macros, for reference: @@ -2693,9 +2693,18 @@ which can be used to boot from USB stick or hard disk. Other than a El Torito boot image, the file disk_path needs not to be added to the ISO image. @* +-boot_image isolinux system_area= implies "partition_table=on". +@* "partition_table=on" causes a simple partition table to be written into bytes -446 to 511 of the System Area. It shows a single partiton which starts at -byte 512 and ends where the ISO image ends. +446 to 511 of the System Area. +@* +With type "isolinux" it shows a partition that begins at byte 0 and it causes +the boot image LBA to be written into the MBR. This works only if also +"system_area=" and "bin_path=" or "dir=" is given. +@* +With types "any" and "grub" it shows a single +partiton which starts at byte 512 and ends where the ISO image ends. +This works with or without system_area= or boot image. @* @c @c Bootspec "isohybrid=off" disables MBR generation, "isohybrid=on" @@ -3743,6 +3752,10 @@ Adopted from grub-mkisofs are @minus{}@minus{}protective-msdos-label @minus{}@minus{}modification-date=YYYYMMDDhhmmsscc (see -volume_date uuid). @* +For MBR bootable ISOLINUX images there is -isohybrid-mbr FILE, where +FILE is one of the Syslinux files mbr/isohdp[fp]x*.bin . Use this +instead of -G to apply the effect of -boot_image isolinux partition_table=on. +@* @c Quite special is isolinux_mbr= (see -boot_image isolinux isohybrid=). @c @* Personalites "@strong{xorrisofs}", "@strong{genisoimage}", diff --git a/xorriso/xorriso_timestamp.h b/xorriso/xorriso_timestamp.h index 0a315633..4092d770 100644 --- a/xorriso/xorriso_timestamp.h +++ b/xorriso/xorriso_timestamp.h @@ -1 +1 @@ -#define Xorriso_timestamP "2010.04.10.171214" +#define Xorriso_timestamP "2010.04.10.180103"