From a5651748a6fc05b52a69f60872c7762fb26dcc48 Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Sat, 28 Feb 2015 14:31:04 +0000 Subject: [PATCH] New bootspec alpha_boot=, new -as mkisofs option -alpha-boot --- xorriso/emulators.c | 15 ++++- xorriso/iso_img.c | 59 +++++++++++++++-- xorriso/opts_a_c.c | 11 ++- xorriso/opts_d_h.c | 6 +- xorriso/xorriso.1 | 20 ++++-- xorriso/xorriso.info | 129 +++++++++++++++++++----------------- xorriso/xorriso.texi | 21 ++++-- xorriso/xorriso_timestamp.h | 2 +- xorriso/xorrisoburn.h | 2 + xorriso/xorrisofs.1 | 9 ++- xorriso/xorrisofs.info | 46 +++++++------ xorriso/xorrisofs.texi | 11 ++- 12 files changed, 226 insertions(+), 105 deletions(-) diff --git a/xorriso/emulators.c b/xorriso/emulators.c index 755a1964..89512785 100644 --- a/xorriso/emulators.c +++ b/xorriso/emulators.c @@ -626,6 +626,7 @@ int Xorriso_genisofs_count_args(struct XorrisO *xorriso, int argc, char **argv, "-volid", "-old-exclude", "-alpha-boot", "-hppa-cmdline", "-hppa-kernel-32", "-hppa-kernel-64", "-hppa-bootloader", "-hppa-ramdisk", "-mips-boot", "-mipsel-boot", + "-alpha-boot", "-jigdo-jigdo", "-jigdo-template", "-jigdo-min-file-size", "-jigdo-force-md5", "-jigdo-exclude", "-jigdo-map", "-md5-list", "-jigdo-template-compress", @@ -861,6 +862,7 @@ int Xorriso_genisofs_help(struct XorrisO *xorriso, int flag) " -hppa-bootloader FILE Set hppa boot loader file name (relative to image root)", " -hppa-ramdisk FILE Set hppa ramdisk file name (relative to image root)", " -hppa-hdrversion NUMBER Set hppa PALO header version to 4 or 5", +" -alpha-boot FILE Set alpha boot image name (relative to image root)", " --grub2-sparc-core FILE Set path of core file for disk label patching", " -efi-boot-part DISKFILE|--efi-boot-image", " Set data source for EFI System Partition", @@ -1797,7 +1799,8 @@ not_enough_args:; strcmp(argpt, "-partition_cyl_align") == 0 || strcmp(argpt, "-isohybrid-mbr") == 0 || strcmp(argpt, "--grub2-mbr") == 0 || - strncmp(argpt, "-hppa-", 6) == 0) { + strncmp(argpt, "-hppa-", 6) == 0 || + strcmp(argpt, "-alpha-boot") == 0) { if(i+1>=argc) goto not_enough_args; delay_opt_list[delay_opt_count++]= i; @@ -2452,6 +2455,16 @@ problem_handler_2:; if(ret <= 0) goto problem_handler_boot; + } else if(strcmp(argpt, "-alpha-boot") == 0) { + if(i + 1 >= argc) + goto not_enough_args; + i++; + sprintf(sfe, "-as mkisofs %s %s", argpt, argv[i]); + ret= Xorriso_coordinate_system_area(xorriso, 6, 0, sfe, 0); + if(ret <= 0) + goto ex; + ret= Xorriso_set_alpha_boot(xorriso, argv[i], 0); + } else if(strcmp(argpt, "-hfs-bless") == 0) { static char *bless_arg_data[6]= { "/", "-disk_path", "", "-exec", "set_hfs_bless", "p"}; diff --git a/xorriso/iso_img.c b/xorriso/iso_img.c index 2701b714..c0eb58c5 100644 --- a/xorriso/iso_img.c +++ b/xorriso/iso_img.c @@ -561,7 +561,8 @@ int Xorriso_boot_status_non_mbr(struct XorrisO *xorriso, IsoImage *image, Xorriso_status_result(xorriso, filter, fp, flag & 2); return(0); } - if(sa_type != 1 && sa_type != 2 && sa_type != 4 && sa_type != 5) + if(sa_type != 1 && sa_type != 2 && sa_type != 4 && sa_type != 5 && + sa_type != 6) return(0); if(sa_type == 1 || sa_type == 2) { @@ -578,8 +579,7 @@ int Xorriso_boot_status_non_mbr(struct XorrisO *xorriso, IsoImage *image, } } return(num_boots); - } - if(sa_type == 4 || sa_type == 5) { + } else if(sa_type == 4 || sa_type == 5) { ret= iso_image_get_hppa_palo(image, &cmdline, &bootloader, &kernel_32, &kernel_64, &ramdisk); if(ret == 1) { @@ -592,6 +592,15 @@ int Xorriso_boot_status_non_mbr(struct XorrisO *xorriso, IsoImage *image, Xorriso_status_hppa(xorriso, "hdrversion", num, filter, fp, 0); } return(0); + } else if(sa_type == 6) { + ret= iso_image_get_alpha_boot(image, &bootloader); + if (ret == 1 && bootloader != NULL) { + sprintf(line, "-boot_image any alpha_boot="); + Text_shellsafe(bootloader, line, 1); + strcat(line, "\n"); + Xorriso_status_result(xorriso, filter, fp, flag & 2); + } + return(0); } return(0); } @@ -1292,6 +1301,32 @@ int Xorriso_set_hppa_boot_parm(struct XorrisO *xorriso, char *text, char *what, } +/* @param flag bit0= Give up DEC Alpha boot parameters +*/ +int Xorriso_set_alpha_boot(struct XorrisO *xorriso, char *path, int flag) +{ + int ret; + IsoImage *image; + + ret= Xorriso_get_volume(xorriso, &image, 0); + if(ret <= 0) + return(ret); + if(flag & 1) { + /* Give up boot parameters */ + iso_image_set_alpha_boot(image, NULL, 1); + return(1); + } + ret= iso_image_set_alpha_boot(image, path, 0); + if (ret < 0) { + Xorriso_report_iso_error(xorriso, "", ret, + "Error when adding DEC Alpha boot loader", + 0, "FAILURE", 1); + return(0); + } + return(1); +} + + /* @param flag bit0= do not set xorriso->system_area_options, just check bit1= only check for grub2_mbr <-> isolinux partition_table */ @@ -1299,9 +1334,11 @@ int Xorriso_coordinate_system_area(struct XorrisO *xorriso, int sa_type, int options, char *cmd, int flag) { int old_type, old_options, new_options; - static char *type_names[6] = { + static char *type_names[7] = { "MBR", "MIPS Big Endian Volume Header", "MIPS Little Endian Boot Block", - "SUN Disk Label", "HP-PA PALO v4", "HP-PA PALO v5"}; + "SUN Disk Label", "HP-PA PALO v4", "HP-PA PALO v5", + "DEC Alpha SRM Boot Block"}; + static int num_names = 7; old_type= (xorriso->system_area_options & 0xfc) >> 2; old_options= xorriso->system_area_options & 0x3c03; @@ -1315,7 +1352,8 @@ int Xorriso_coordinate_system_area(struct XorrisO *xorriso, int sa_type, (old_type != sa_type || (old_options != 0 && old_options != new_options))){ reject:; sprintf(xorriso->info_text, "%s : First sector already occupied by %s", - cmd, old_type < 6 ? type_names[old_type] : "other boot facility"); + cmd, old_type < num_names ? + type_names[old_type] : "other boot facility"); if(old_type == 0 && (old_options & 2)) strcat(xorriso->info_text, " for ISOLINUX isohybrid"); else if (old_type == 0 && (xorriso->system_area_options & (1 << 14))) { @@ -1850,6 +1888,15 @@ static int Xorriso_scan_report_lines(struct XorrisO *xorriso, sprintf(buf, "-boot_image any hppa_bootloader="); Text_shellsafe(textpt, buf, 1); + } else if(strcmp(name, "DEC Alpha ldr path :") == 0) { + if(mkisofs) + sprintf(buf, "-alpha-boot "); + else + sprintf(buf, "-boot_image any alpha_boot="); + Text_shellsafe(textpt, buf, 1); + + /* >>> what to do if "DEC Alpha ldr adr :" without path ? */; + } if(buf[0]) diff --git a/xorriso/opts_a_c.c b/xorriso/opts_a_c.c index 5b18e43d..13d4c38a 100644 --- a/xorriso/opts_a_c.c +++ b/xorriso/opts_a_c.c @@ -866,10 +866,12 @@ treatment_patch:; } else if(strcmp(treatpt, "mips_discard") == 0 || strcmp(treatpt, "mipsel_discard") == 0 || strcmp(treatpt, "sparc_discard") == 0 || - strcmp(treatpt, "hppa_discard") == 0) { + strcmp(treatpt, "hppa_discard") == 0 || + strcmp(treatpt, "alpha_discard") == 0) { xorriso->system_area_options&= ~0xfc; /* system area type 0 */ Xorriso_add_mips_boot_file(xorriso, "", 1); /* give up MIPS boot files */ Xorriso_set_hppa_boot_parm(xorriso, "", "", 1); /* give up HP-PA files */ + Xorriso_set_alpha_boot(xorriso, "", 1); /* give up DEC Alpha loader */ } else if(strncmp(treatpt, "sparc_label=", 12) == 0) { sprintf(eff_path, "-boot_image %s sparc_label=", formpt); @@ -909,6 +911,13 @@ treatment_patch:; parm[parm_len]= 0; ret= Xorriso_set_hppa_boot_parm(xorriso, eqpt + 1, parm, 0); + } else if(strncmp(treatpt, "alpha_boot=", 11) == 0) { + sprintf(eff_path, "-boot_image %s %s", formpt, treatpt); + ret= Xorriso_coordinate_system_area(xorriso, 6, 0, eff_path, 0); + if(ret <= 0) + goto ex; + ret = Xorriso_set_alpha_boot(xorriso, treatpt + 11, 0); + } else if(strncmp(treatpt, "boot_info_table=", 16)==0) { if(strcmp(treatpt + 16, "off") == 0) xorriso->patch_isolinux_image= (xorriso->patch_isolinux_image & ~3) | 0; diff --git a/xorriso/opts_d_h.c b/xorriso/opts_d_h.c index ccd5ac9d..be912f3e 100644 --- a/xorriso/opts_d_h.c +++ b/xorriso/opts_d_h.c @@ -1747,7 +1747,8 @@ int Xorriso_option_help(struct XorrisO *xorriso, int flag) " |\"sparc_label=\"|\"grub2_sparc_core=\"|\"sparc_discard\"", " |\"hppa_cmdline=\"|\"hppa_bootloader=\"|\"hppa_kernel_32=\"", " |\"hppa_kernel_64=\"|\"hppa_ramdisk=\"|\"hppa_hdrversion=\"", -" |\"hppa_discard\"|\"hfsplus_serial=\"|\"hfsplus_block_size=\"", +" |\"hppa_discard\"|\"alpha_boot=\"|\"alpha_discard\"", +" |\"hfsplus_serial=\"|\"hfsplus_block_size=\"", " |\"apm_block_size=\"|\"show_status\"", " Whether to discard or keep an exiting El Torito boot image.", " ISOLINUX can be made bootable by dir=/ or dir=/isolinux", @@ -1762,7 +1763,8 @@ int Xorriso_option_help(struct XorrisO *xorriso, int flag) " mips_path= adds Big Endian MIPS boot files. mipsel_path=", " sets one Little Endian MIPS boot file. sparc_label=", " activates SUN Disk Label. hppa_* is for HP PA-RISC via PALO.", -" All four are mutually exclusive and exclusive to production", +" alpha_boot= is for DEC Alpha SRM. MIPS, SUN, HP, and Alpha", +" are mutually exclusive and exclusive to production", " of MBR and to booting via EFI from USB stick.", " -append_partition partition_number type_code disk_path", " Append a prepared filesystem image after the end of the", diff --git a/xorriso/xorriso.1 b/xorriso/xorriso.1 index 9f212e45..97252a58 100644 --- a/xorriso/xorriso.1 +++ b/xorriso/xorriso.1 @@ -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 "Version 1.3.9, Feb 06, 2015" +.TH XORRISO 1 "Version 1.3.9, Feb 28, 2015" .\" Please adjust this date whenever revising the manpage. .\" .\" Some roff macros, for reference: @@ -2920,8 +2920,11 @@ There are booting mechanisms which do not use an El Torito record but rather start at the first bytes of the image: PC\-BIOS MBR or EFI GPT for hard\-disk\-like devices, APM partition entries for Macs which expect HFS+ boot images, -MIPS Volume Header for old SGI computers, DEC Boot Block for old DECstation, -SUN Disk Label for SPARC machines, HP\-PA boot sector for HP PA\-RISC machines. +MIPS Volume Header for old SGI computers, +DEC Boot Block for old MIPS DECstation, +SUN Disk Label for SPARC machines, +HP\-PA boot sector for HP PA\-RISC machines, +DEC Alpha SRM boot sector for old DEC Alpha machines. .br .TP \fB\-boot_image\fR "any"|"isolinux"|"grub" @@ -3236,8 +3239,15 @@ RAM disk file. and version 4. For the appropriate value see in PALO source code: PALOHDRVERSION. .br -\fBmips_discard\fR, \fBsparc_discard\fR, and \fBhppa_discard\fR -revoke any boot file declarations made for mips, mipsel, sparc resp. hppa. +\fBalpha_boot=\fRiso_rr_path declares a data file in the image to be the +DEC Alpha SRM Secondary Bootloader and causes production of a boot sector +which points to it. +This is mutually exclusive with production of other boot blocks like MBR. +.br +\fBmips_discard\fR, \fBsparc_discard\fR, \fBhppa_discard\fR, +\fBalpha_discard\fR +revoke any boot file declarations made for mips, mipsel, sparc, hppa, +resp. alpha. This removes the ban on production of other boot blocks. .br \fBhfsplus_serial=\fRhexstring sets a string of 16 digits "0" to "9" diff --git a/xorriso/xorriso.info b/xorriso/xorriso.info index e82edb43..794c3dca 100644 --- a/xorriso/xorriso.info +++ b/xorriso/xorriso.info @@ -2582,8 +2582,9 @@ There are booting mechanisms which do not use an El Torito record but rather start at the first bytes of the image: PC-BIOS MBR or EFI GPT for hard-disk-like devices, APM partition entries for Macs which expect HFS+ boot images, MIPS Volume Header for old SGI computers, DEC Boot -Block for old DECstation, SUN Disk Label for SPARC machines, HP-PA boot -sector for HP PA-RISC machines. +Block for old MIPS DECstation, SUN Disk Label for SPARC machines, HP-PA +boot sector for HP PA-RISC machines, DEC Alpha SRM boot sector for old +DEC Alpha machines. -boot_image "any"|"isolinux"|"grub" "discard"|"keep"|"patch"|"show_status"|bootspec|"next" @@ -2838,9 +2839,14 @@ sector for HP PA-RISC machines. *hppa_hdrversion=*number chooses between PALO header version 5 (default) and version 4. For the appropriate value see in PALO source code: PALOHDRVERSION. - *mips_discard*, *sparc_discard*, and *hppa_discard* revoke any - boot file declarations made for mips, mipsel, sparc resp. hppa. - This removes the ban on production of other boot blocks. + *alpha_boot=*iso_rr_path declares a data file in the image to be + the DEC Alpha SRM Secondary Bootloader and causes production of a + boot sector which points to it. This is mutually exclusive with + production of other boot blocks like MBR. + *mips_discard*, *sparc_discard*, *hppa_discard*, *alpha_discard* + revoke any boot file declarations made for mips, mipsel, sparc, + hppa, resp. alpha. This removes the ban on production of other + boot blocks. *hfsplus_serial=*hexstring sets a string of 16 digits "0" to "9" and letters "a" to "f", which will be used as unique serial number of an emerging HFS+ filesystem. @@ -5056,7 +5062,7 @@ File: xorriso.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: Top * -alter_date sets timestamps in ISO image: Manip. (line 154) * -alter_date_r sets timestamps in ISO image: Manip. (line 187) * -append_partition adds arbitrary file after image end: Bootable. - (line 296) + (line 302) * -application_id sets application id: SetWrite. (line 196) * -application_use sets application use field: SetWrite. (line 262) * -as emulates mkisofs or cdrecord: Emulation. (line 13) @@ -5066,7 +5072,7 @@ File: xorriso.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: Top * -ban_stdio_write demands real drive: Loading. (line 278) * -biblio_file sets biblio file name: SetWrite. (line 244) * -blank erases media: Writing. (line 61) -* -boot_image controls bootability: Bootable. (line 26) +* -boot_image controls bootability: Bootable. (line 27) * -calm_drive reduces drive activity: Loading. (line 267) * -cd sets working directory in ISO: Navigate. (line 7) * -cdx sets working directory on disk: Navigate. (line 16) @@ -5294,11 +5300,11 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top * ACL, set in ISO image, -setfacl_r: Manip. (line 105) * ACL, show in ISO image, -getfacl: Navigate. (line 70) * ACL, show in ISO image, -getfacl_r: Navigate. (line 77) -* APM block size: Bootable. (line 287) +* APM block size: Bootable. (line 293) * APM, _definition: Extras. (line 41) * Appendable media, _definition: Media. (line 38) -* Appended Filesystem Image, -append_partition: Bootable. (line 296) -* Appended partition, in MBR or GPT: Bootable. (line 184) +* Appended Filesystem Image, -append_partition: Bootable. (line 302) +* Appended partition, in MBR or GPT: Bootable. (line 185) * Automatic execution order, of arguments, -x: ArgSort. (line 16) * Backslash Interpretation, _definition: Processing. (line 52) * Backup, enable fast incremental, -disk_dev_ino: Loading. (line 217) @@ -5306,7 +5312,7 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top * Backup, scdbackup checksum tag, -scdbackup: Emulation. (line 179) * Blank media, _definition: Media. (line 29) * Blind growing, _definition: Methods. (line 40) -* Bootability, control, -boot_image: Bootable. (line 26) +* Bootability, control, -boot_image: Bootable. (line 27) * Bugs, reporting: Bugreport. (line 6) * cdrecord, Emulation: Emulation. (line 118) * Character Set, _definition: Charset. (line 6) @@ -5315,14 +5321,15 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top * Character Set, for output, -out_charset: SetWrite. (line 276) * Character set, learn from image, -auto_charset: Loading. (line 122) * Character Set, of terminal, -local_charset: Charset. (line 58) -* CHRP partition, _definition: Bootable. (line 189) +* CHRP partition, _definition: Bootable. (line 190) * Closed media, _definition: Media. (line 43) * Comment, #: Scripting. (line 173) * Control, signal handling, -signal_handling: Exception. (line 69) * Create, new ISO image, _definition: Methods. (line 6) -* Cylinder alignment, _definition: Bootable. (line 229) -* Cylinder size, _definition: Bootable. (line 218) +* Cylinder alignment, _definition: Bootable. (line 230) +* Cylinder size, _definition: Bootable. (line 219) * Damaged track and session, close, -close_damaged: Writing. (line 170) +* DEC Alpha SRM boot sector, production: Bootable. (line 279) * Delete, from ISO image, -rm: Manip. (line 21) * Delete, from ISO image, -rm_r: Manip. (line 28) * Delete, ISO directory, -rmdir: Manip. (line 32) @@ -5353,7 +5360,7 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top * Drive, write and eject, -commit_eject: Writing. (line 56) * EA, _definition: Extras. (line 65) * ECMA-119, _definition: Model. (line 6) -* EFI system partition, _definition: Bootable. (line 198) +* EFI system partition, _definition: Bootable. (line 199) * El Torito, _definition: Extras. (line 19) * Emulation, -as: Emulation. (line 13) * Emulation, .mkisofsrc, -read_mkisofsrc: Emulation. (line 153) @@ -5380,10 +5387,10 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top * Group, in ISO image, -chgrp_r: Manip. (line 62) * Growing, _definition: Methods. (line 19) * Hard links, control handling, -hardlinks: Loading. (line 134) -* HFS+ allocation block size: Bootable. (line 284) -* HFS+ serial number: Bootable. (line 281) +* HFS+ allocation block size: Bootable. (line 290) +* HFS+ serial number: Bootable. (line 287) * hidden, set in ISO image, -hide: Manip. (line 191) -* HP-PA boot sector, production: Bootable. (line 261) +* HP-PA boot sector, production: Bootable. (line 262) * Image reading, cache size, -data_cache_size: Loading. (line 296) * Image, _definition: Model. (line 9) * Image, demand volume ID, -assert_volid: Loading. (line 108) @@ -5435,13 +5442,13 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top * List delimiter, _definition: Processing. (line 9) * Local Character Set, _definition: Charset. (line 11) * MBR, _definition: Extras. (line 26) -* MBR, set, -boot_image system_area=: Bootable. (line 135) +* MBR, set, -boot_image system_area=: Bootable. (line 136) * MD5, control handling, -md5: Loading. (line 183) * Media, erase, -blank: Writing. (line 61) * Media, format, -format: Writing. (line 91) * Media, list formats, -list_formats: Writing. (line 134) * Media, list write speeds, -list_speeds: Writing. (line 146) -* MIPS boot file, activation: Bootable. (line 240) +* MIPS boot file, activation: Bootable. (line 241) * mkisofs, Emulation: Emulation. (line 16) * Modifying, _definition: Methods. (line 27) * Multi-session media, _definition: Media. (line 7) @@ -5468,15 +5475,15 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top * Ownership, global in ISO image, -uid: SetWrite. (line 282) * Ownership, in ISO image, -chown: Manip. (line 49) * Ownership, in ISO image, -chown_r: Manip. (line 54) -* Partition offset, _definition: Bootable. (line 208) -* Partition table, _definition: Bootable. (line 165) +* Partition offset, _definition: Bootable. (line 209) +* Partition table, _definition: Bootable. (line 166) * Pathspec, _definition: SetInsert. (line 124) * Pattern expansion, _definition: Processing. (line 24) * Pattern expansion, for disk paths, -disk_pattern: Insert. (line 36) * Pattern expansion, for ISO paths, -iso_rr_pattern: Manip. (line 10) * Permissions, in ISO image, -chmod: Manip. (line 65) * Permissions, in ISO image, -chmod_r: Manip. (line 77) -* PReP partition, _definition: Bootable. (line 193) +* PReP partition, _definition: Bootable. (line 194) * Problems, reporting: Bugreport. (line 6) * Process, consolidate text output, -pkt_output: Frontend. (line 7) * Process, control abort on error, -abort_on: Exception. (line 27) @@ -5535,10 +5542,10 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top * Session, mount parameters, -mount_opts: Inquiry. (line 68) * Session, select as input, -load: Loading. (line 35) * Sorting order, for -x, -list_arg_sorting: ArgSort. (line 27) -* SUN Disk Label, production: Bootable. (line 251) -* SUN SPARC boot images, activation: Bootable. (line 319) +* SUN Disk Label, production: Bootable. (line 252) +* SUN SPARC boot images, activation: Bootable. (line 325) * Symbolic link, create, -lns: Insert. (line 176) -* System area, _definition: Bootable. (line 135) +* System area, _definition: Bootable. (line 136) * Table-of-content, search sessions, -rom_toc_scan: Loading. (line 238) * Table-of-content, show, -toc: Inquiry. (line 28) * Timestamps, set in ISO image, -alter_date: Manip. (line 154) @@ -5554,7 +5561,7 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top * Verify, file tree checksums, -check_md5_r: Verify. (line 182) * Verify, preset -check_media, -check_media_defaults: Verify. (line 41) * Write, block size, -dvd_obs: SetWrite. (line 333) -* Write, bootability, -boot_image: Bootable. (line 26) +* Write, bootability, -boot_image: Bootable. (line 27) * Write, buffer syncing, -stdio_sync: SetWrite. (line 340) * Write, close media, -close: SetWrite. (line 359) * Write, compliance to specs, -compliance: SetWrite. (line 58) @@ -5604,39 +5611,39 @@ Node: Filter94447 Node: Writing99069 Node: SetWrite109200 Node: Bootable129906 -Node: Jigdo149162 -Node: Charset153409 -Node: Exception156724 -Node: DialogCtl162844 -Node: Inquiry165442 -Node: Navigate173780 -Node: Verify182078 -Node: Restore191905 -Node: Emulation200509 -Node: Scripting210897 -Node: Frontend218668 -Node: Examples228275 -Node: ExDevices229453 -Node: ExCreate230119 -Node: ExDialog231404 -Node: ExGrowing232669 -Node: ExModifying233474 -Node: ExBootable233978 -Node: ExCharset234530 -Node: ExPseudo235422 -Node: ExCdrecord236320 -Node: ExMkisofs236637 -Node: ExGrowisofs237977 -Node: ExException239112 -Node: ExTime239566 -Node: ExIncBackup240025 -Node: ExRestore244015 -Node: ExRecovery244948 -Node: Files245518 -Node: Seealso246817 -Node: Bugreport247540 -Node: Legal248121 -Node: CommandIdx249132 -Node: ConceptIdx266013 +Node: Jigdo149506 +Node: Charset153753 +Node: Exception157068 +Node: DialogCtl163188 +Node: Inquiry165786 +Node: Navigate174124 +Node: Verify182422 +Node: Restore192249 +Node: Emulation200853 +Node: Scripting211241 +Node: Frontend219012 +Node: Examples228619 +Node: ExDevices229797 +Node: ExCreate230463 +Node: ExDialog231748 +Node: ExGrowing233013 +Node: ExModifying233818 +Node: ExBootable234322 +Node: ExCharset234874 +Node: ExPseudo235766 +Node: ExCdrecord236664 +Node: ExMkisofs236981 +Node: ExGrowisofs238321 +Node: ExException239456 +Node: ExTime239910 +Node: ExIncBackup240369 +Node: ExRestore244359 +Node: ExRecovery245292 +Node: Files245862 +Node: Seealso247161 +Node: Bugreport247884 +Node: Legal248465 +Node: CommandIdx249476 +Node: ConceptIdx266357  End Tag Table diff --git a/xorriso/xorriso.texi b/xorriso/xorriso.texi index ee1394ad..af0d189f 100644 --- a/xorriso/xorriso.texi +++ b/xorriso/xorriso.texi @@ -50,7 +50,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 "Version 1.3.9, Feb 06, 2015" +@c man .TH XORRISO 1 "Version 1.3.9, Feb 28, 2015" @c man .\" Please adjust this date whenever revising the manpage. @c man .\" @c man .\" Some roff macros, for reference: @@ -3433,8 +3433,11 @@ There are booting mechanisms which do not use an El Torito record but rather start at the first bytes of the image: PC-BIOS MBR or EFI GPT for hard-disk-like devices, APM partition entries for Macs which expect HFS+ boot images, -MIPS Volume Header for old SGI computers, DEC Boot Block for old DECstation, -SUN Disk Label for SPARC machines, HP-PA boot sector for HP PA-RISC machines. +MIPS Volume Header for old SGI computers, +DEC Boot Block for old MIPS DECstation, +SUN Disk Label for SPARC machines, +HP-PA boot sector for HP PA-RISC machines, +DEC Alpha SRM boot sector for old DEC Alpha machines. @* @table @asis @sp 1 @@ -3771,8 +3774,16 @@ RAM disk file. and version 4. For the appropriate value see in PALO source code: PALOHDRVERSION. @* -@strong{mips_discard}, @strong{sparc_discard}, and @strong{hppa_discard} -revoke any boot file declarations made for mips, mipsel, sparc resp. hppa. +@cindex DEC Alpha SRM boot sector, production +@strong{alpha_boot=}iso_rr_path declares a data file in the image to be the +DEC Alpha SRM Secondary Bootloader and causes production of a boot sector +which points to it. +This is mutually exclusive with production of other boot blocks like MBR. +@* +@strong{mips_discard}, @strong{sparc_discard}, @strong{hppa_discard}, +@strong{alpha_discard} +revoke any boot file declarations made for mips, mipsel, sparc, hppa, +resp. alpha. This removes the ban on production of other boot blocks. @* @cindex HFS+ serial number diff --git a/xorriso/xorriso_timestamp.h b/xorriso/xorriso_timestamp.h index 786a91e8..d58d48d4 100644 --- a/xorriso/xorriso_timestamp.h +++ b/xorriso/xorriso_timestamp.h @@ -1 +1 @@ -#define Xorriso_timestamP "2015.02.07.114834" +#define Xorriso_timestamP "2015.02.28.142843" diff --git a/xorriso/xorrisoburn.h b/xorriso/xorrisoburn.h index 67f7c58c..ffc3290c 100644 --- a/xorriso/xorrisoburn.h +++ b/xorriso/xorrisoburn.h @@ -546,6 +546,8 @@ int Xorriso_add_mips_boot_file(struct XorrisO *xorriso, char *path, int flag); int Xorriso_set_hppa_boot_parm(struct XorrisO *xorriso, char *text, char *what, int flag); +int Xorriso_set_alpha_boot(struct XorrisO *xorriso, char *path, int flag); + int Xorriso_coordinate_system_area(struct XorrisO *xorriso, int sa_type, int options, char *cmd, int flag); diff --git a/xorriso/xorrisofs.1 b/xorriso/xorrisofs.1 index 77bd4d13..0c72914f 100644 --- a/xorriso/xorrisofs.1 +++ b/xorriso/xorrisofs.1 @@ -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 XORRISOFS 1 "Version 1.3.9, Feb 06, 2015" +.TH XORRISOFS 1 "Version 1.3.9, Feb 28, 2015" .\" Please adjust this date whenever revising the manpage. .\" .\" Some roff macros, for reference: @@ -1019,7 +1019,7 @@ MBR, GPT and APM are combinable. APM occupies the first 8 bytes of MBR boot code. All three do not hamper El Torito booting from CDROM. .br \fBxorrisofs\fR supports further boot facilities: -MIPS Big Endian (SGI), MIPS Little Endian (DEC), SUN SPARC, HP\-PA. +MIPS Big Endian (SGI), MIPS Little Endian (DEC), SUN SPARC, HP\-PA, DEC Alpha. Those are mutually not combinable and also not combinable with MBR, GPT, or APM. .br @@ -1258,6 +1258,11 @@ Designate the given path as HP\-PA RAM disk file. Choose between PALO header version 5 (default) and version 4. For the appropriate value see in PALO source code: PALOHDRVERSION. .TP +\fB\-alpha-boot\fR iso_rr_path +Declare a data file in the image to be the DEC Alpha SRM Secondary Bootstrap +Loader and cause production of a boot sector which points to it. +This is mutually exclusive with production of other boot blocks like MBR. +.TP .B Character sets: .PP Character sets should not matter as long as only english alphanumeric diff --git a/xorriso/xorrisofs.info b/xorriso/xorrisofs.info index d0dedfd2..6c7fd42a 100644 --- a/xorriso/xorrisofs.info +++ b/xorriso/xorrisofs.info @@ -1000,8 +1000,8 @@ Macs for booting and for mounting. MBR, GPT and APM are combinable. APM occupies the first 8 bytes of MBR boot code. All three do not hamper El Torito booting from CDROM. `xorrisofs' supports further boot facilities: MIPS Big Endian (SGI), -MIPS Little Endian (DEC), SUN SPARC, HP-PA. Those are mutually not -combinable and also not combinable with MBR, GPT, or APM. +MIPS Little Endian (DEC), SUN SPARC, HP-PA, DEC Alpha. Those are +mutually not combinable and also not combinable with MBR, GPT, or APM. -G disk_path Copy at most 32768 bytes from the given disk file to the very @@ -1227,6 +1227,12 @@ combinable and also not combinable with MBR, GPT, or APM. Choose between PALO header version 5 (default) and version 4. For the appropriate value see in PALO source code: PALOHDRVERSION. +-alpha-boot iso_rr_path + Declare a data file in the image to be the DEC Alpha SRM Secondary + Bootstrap Loader and cause production of a boot sector which + points to it. This is mutually exclusive with production of other + boot blocks like MBR. +  File: xorrisofs.info, Node: Charset, Next: Jigdo, Prev: SystemArea, Up: Options @@ -1870,6 +1876,7 @@ File: xorrisofs.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: T * -A set Application Id: ImageId. (line 38) * -abstract set Abstract File path: ImageId. (line 66) * -allow-lowercase lowercase in ISO file names: SetCompl. (line 46) +* -alpha-boot DEC Alpha SRM bootloader: SystemArea. (line 249) * -append_partition Append MBR partition after image: SystemArea. (line 132) * -appended_part_as_gpt Appended partitions in GPT: SystemArea. @@ -2076,6 +2083,7 @@ File: xorrisofs.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top (line 95) * Bootability, control, --grub2-sparc-core: SystemArea. (line 219) * Bootability, control, --efi-boot: Bootable. (line 58) +* Bootability, control, -alpha-boot: SystemArea. (line 249) * Bootability, control, -b, -eltorito-boot: Bootable. (line 32) * Bootability, control, -B, -sparc-boot: SystemArea. (line 201) * Bootability, control, -e: Bootable. (line 50) @@ -2269,22 +2277,22 @@ Node: SetHide30591 Node: ImageId31899 Node: Bootable36067 Node: SystemArea41247 -Node: Charset53165 -Node: Jigdo54191 -Node: Miscellaneous58458 -Node: Examples60102 -Node: ExSimple60588 -Node: ExGraft61067 -Node: ExMkisofs62314 -Node: ExGrowisofs63567 -Node: ExIncBackup64739 -Node: ExIncBckAcc67857 -Node: ExBootable69533 -Node: Files71625 -Node: Seealso72699 -Node: Bugreport73355 -Node: Legal73936 -Node: CommandIdx74831 -Node: ConceptIdx90183 +Node: Charset53438 +Node: Jigdo54464 +Node: Miscellaneous58731 +Node: Examples60375 +Node: ExSimple60861 +Node: ExGraft61340 +Node: ExMkisofs62587 +Node: ExGrowisofs63840 +Node: ExIncBackup65012 +Node: ExIncBckAcc68130 +Node: ExBootable69806 +Node: Files71898 +Node: Seealso72972 +Node: Bugreport73628 +Node: Legal74209 +Node: CommandIdx75104 +Node: ConceptIdx90529  End Tag Table diff --git a/xorriso/xorrisofs.texi b/xorriso/xorrisofs.texi index 5d4da0e0..b49a9246 100644 --- a/xorriso/xorrisofs.texi +++ b/xorriso/xorrisofs.texi @@ -50,7 +50,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 XORRISOFS 1 "Version 1.3.9, Feb 06, 2015" +@c man .TH XORRISOFS 1 "Version 1.3.9, Feb 28, 2015" @c man .\" Please adjust this date whenever revising the manpage. @c man .\" @c man .\" Some roff macros, for reference: @@ -1391,7 +1391,7 @@ MBR, GPT and APM are combinable. APM occupies the first 8 bytes of MBR boot code. All three do not hamper El Torito booting from CDROM. @* @command{xorrisofs} supports further boot facilities: -MIPS Big Endian (SGI), MIPS Little Endian (DEC), SUN SPARC, HP-PA. +MIPS Big Endian (SGI), MIPS Little Endian (DEC), SUN SPARC, HP-PA, DEC Alpha. Those are mutually not combinable and also not combinable with MBR, GPT, or APM. @* @@ -1689,6 +1689,13 @@ Designate the given path as HP-PA RAM disk file. @cindex Bootability, control, -hppa-hdrversion Choose between PALO header version 5 (default) and version 4. For the appropriate value see in PALO source code: PALOHDRVERSION. +@c man .TP +@item -alpha-boot iso_rr_path +@kindex -alpha-boot DEC Alpha SRM bootloader +@cindex Bootability, control, -alpha-boot +Declare a data file in the image to be the DEC Alpha SRM Secondary Bootstrap +Loader and cause production of a boot sector which points to it. +This is mutually exclusive with production of other boot blocks like MBR. @end table @c man .TP @c man .B Character sets: