diff --git a/xorriso/opts_d_h.c b/xorriso/opts_d_h.c index 9cc79b1f..e2ecaf8a 100644 --- a/xorriso/opts_d_h.c +++ b/xorriso/opts_d_h.c @@ -1227,8 +1227,17 @@ int Xorriso_option_hardlinks(struct XorrisO *xorriso, char *mode, int flag) return(0); } } + + /* <<< ts B00613 : This is wrong: it enables new_rr if -hardlinks is off. + Documented is that new_rr gets enabled if hardlinks are on. + But it never worked that way. + A compromise seems to be to disable this totally and + to change man xorriso. + new_rr still is not recognized by mount on Solaris. + if(xorriso->ino_behavior & 2) Xorriso_option_compliance(xorriso, "new_rr", 0); + */ return(1); } diff --git a/xorriso/xorriso.1 b/xorriso/xorriso.1 index f2d62028..f11a576e 100644 --- a/xorriso/xorriso.1 +++ b/xorriso/xorriso.1 @@ -732,10 +732,6 @@ are both in effect. This restricts hard linking to other files restored by the same single extract command. -hardlinks "normal_extract" re-enables wide and expensive hardlink accumulation. .br -Hardlink processing automatically enables \fB\-compliance new_rr\fR. -This may be overridden by a following -compliance old_rr . In this case -the resulting image will violate the RRIP-1.10 specs for entry PX in -the same way as mkisofs does. .TP \fB\-acl\fR "on"|"off" Enable or disable processing of ACLs. diff --git a/xorriso/xorriso.info b/xorriso/xorriso.info index 6c4d262d..9b42aff8 100644 --- a/xorriso/xorriso.info +++ b/xorriso/xorriso.info @@ -689,11 +689,6 @@ activate them only after image loading. restored by the same single extract command. -hardlinks "normal_extract" re-enables wide and expensive hardlink accumulation. - Hardlink processing automatically enables *-compliance new_rr*. - This may be overridden by a following -compliance old_rr . In this - case the resulting image will violate the RRIP-1.10 specs for - entry PX in the same way as mkisofs does. - -acl "on"|"off" Enable or disable processing of ACLs. If enabled, then xorriso will obtain ACLs from disk file objects, store ACLs in the ISO @@ -3644,7 +3639,7 @@ File: xorriso.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: Top * # starts a comment line: Scripting. (line 128) * -abort_on controls abort on error: Exception. (line 27) -* -acl controls handling of ACLs: Loading. (line 128) +* -acl controls handling of ACLs: Loading. (line 123) * -add inserts one or more paths: Insert. (line 42) * -add_plainly inserts one or more paths: Insert. (line 61) * -alter_date sets timestamps in ISO image: Manip. (line 146) @@ -3654,10 +3649,10 @@ File: xorriso.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: Top * -assert_volid rejects undesired images: Loading. (line 65) * -auto_charset learns character set from image: Loading. (line 80) * -backslash_codes enables backslash conversion: Scripting. (line 45) -* -ban_stdio_write demands real drive: Loading. (line 225) +* -ban_stdio_write demands real drive: Loading. (line 220) * -blank erases media: Writing. (line 45) * -boot_image controls bootability: Bootable. (line 20) -* -calm_drive reduces drive activity: Loading. (line 214) +* -calm_drive reduces drive activity: Loading. (line 209) * -cd sets working directory in ISO: Navigate. (line 7) * -cdx sets working directory on disk: Navigate. (line 16) * -charset sets input/output character set: Charset. (line 43) @@ -3687,7 +3682,7 @@ File: xorriso.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: Top * -dev aquires one drive for input and output: AqDrive. (line 10) * -devices gets list of drives: Inquiry. (line 7) * -dialog enables dialog mode: DialogCtl. (line 7) -* -disk_dev_ino fast incremental backup: Loading. (line 168) +* -disk_dev_ino fast incremental backup: Loading. (line 163) * -disk_pattern controls pattern expansion: Insert. (line 31) * -drive_class controls drive accessability: Loading. (line 35) * -du show directory size in ISO image: Navigate. (line 84) @@ -3710,7 +3705,7 @@ File: xorriso.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: Top * -find traverses and alters ISO tree: CmdFind. (line 7) * -findx traverses disk tree: Navigate. (line 101) * -follow softlinks and mount points: SetInsert. (line 76) -* -for_backup -acl,-xattr,-hardlinks,-md5: Loading. (line 163) +* -for_backup -acl,-xattr,-hardlinks,-md5: Loading. (line 158) * -format formats media: Writing. (line 69) * -fs sets size of fifo: SetWrite. (line 192) * -getfacl shows ACL in ISO image: Navigate. (line 65) @@ -3744,7 +3739,7 @@ File: xorriso.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: Top * -map_l inserts paths from disk file: Insert. (line 94) * -map_single inserts path: Insert. (line 90) * -mark sets synchronizing message: Frontend. (line 25) -* -md5 controls handling of MD5 sums: Loading. (line 141) +* -md5 controls handling of MD5 sums: Loading. (line 136) * -mkdir creates ISO directory: Insert. (line 166) * -mount issues mount command for ISO session: Restore. (line 122) * -mount_cmd composes mount command line: Inquiry. (line 31) @@ -3786,7 +3781,7 @@ File: xorriso.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: Top * -rmdir deletes ISO directory: Manip. (line 32) * -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) +* -rom_toc_scan searches for sessions: Loading. (line 184) * -scdbackup_tag enables scdbackup checksum tag: Emulation. (line 115) * -scsi_log reports SCSI commands: Scripting. (line 113) * -session_log logs written sessions: Scripting. (line 104) @@ -3820,7 +3815,7 @@ File: xorriso.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: Top * -volid sets volume id: SetWrite. (line 60) * -volset_id sets volume set id: SetWrite. (line 79) * -volume_date sets volume timestamp: SetWrite. (line 103) -* -xattr controls handling of xattr (EA): Loading. (line 136) +* -xattr controls handling of xattr (EA): Loading. (line 131) * -zisofs controls zisofs production: SetWrite. (line 136)  @@ -3833,7 +3828,7 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top * Menu: * ACL, _definiton: Extras. (line 36) -* ACL, control handling, -acl: Loading. (line 128) +* ACL, control handling, -acl: Loading. (line 123) * ACL, set in ISO image, -setfacl: Manip. (line 73) * ACL, set in ISO image, -setfacl_list: Manip. (line 100) * ACL, set in ISO image, -setfacl_r: Manip. (line 97) @@ -3841,8 +3836,8 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top * ACL, show in ISO image, -getfacl_r: Navigate. (line 72) * Appendable media, _definition: Media. (line 34) * Backslash Interpretation, _definition: Processing. (line 49) -* Backup, enable fast incremental, -disk_dev_ino: Loading. (line 168) -* Backup, enable features, -for_backup: Loading. (line 163) +* Backup, enable fast incremental, -disk_dev_ino: Loading. (line 163) +* Backup, enable features, -for_backup: Loading. (line 158) * Backup, scdbackup checksum tag, -scdbackup: Emulation. (line 115) * Blank media, _definition: Media. (line 25) * Blind growing, _definition: Methods. (line 40) @@ -3870,14 +3865,14 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top * disk_path, _definition: Insert. (line 6) * Drive, _definiton: Drives. (line 6) * Drive, accessability, -drive_class: Loading. (line 35) -* Drive, demand real MMC, -ban_stdio_write: Loading. (line 225) +* Drive, demand real MMC, -ban_stdio_write: Loading. (line 220) * Drive, eject tray, -eject: Writing. (line 36) * Drive, for input and output, -dev: AqDrive. (line 10) * Drive, for input, -indev: AqDrive. (line 22) * Drive, for output, -outdev: AqDrive. (line 29) * Drive, get drive list, -devices: Inquiry. (line 7) * Drive, list supported media, -list_profiles: Writing. (line 119) -* Drive, reduce activity, -calm_drive: Loading. (line 214) +* Drive, reduce activity, -calm_drive: Loading. (line 209) * Drive, report SCSI commands, -scsi_log: Scripting. (line 113) * Drive, write and eject, -commit_eject: Writing. (line 40) * El Torito, _definiton: Extras. (line 19) @@ -3936,7 +3931,7 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top * List delimiter, _definiton: Processing. (line 8) * MBR, _definiton: Extras. (line 26) * MBR, set, -boot_image system_area=: Bootable. (line 109) -* MD5, control handling, -md5: Loading. (line 141) +* MD5, control handling, -md5: Loading. (line 136) * Media, erase, -blank: Writing. (line 45) * Media, format, -format: Writing. (line 69) * Media, list formats, -list_formats: Writing. (line 107) @@ -4017,7 +4012,7 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top * Session, mount parameters, -mount_opts: Inquiry. (line 47) * Session, select as input, -load: Loading. (line 11) * System area, _definiton: Bootable. (line 109) -* Table-of-content, search sessions, -rom_toc_scan: Loading. (line 189) +* Table-of-content, search sessions, -rom_toc_scan: Loading. (line 184) * Table-of-content, show, -toc: Inquiry. (line 18) * Timestamps, set in ISO image, -alter_date: Manip. (line 146) * Timestamps, set in ISO image, -alter_date_r: Manip. (line 166) @@ -4047,7 +4042,7 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top * Write, set speed, -speed: SetWrite. (line 148) * Write, simulation, -dummy: SetWrite. (line 188) * xattr, _definiton: Extras. (line 50) -* xattr, control handling, -xattr: Loading. (line 136) +* xattr, control handling, -xattr: Loading. (line 131) * xattr, set in ISO image, -setfattr: Manip. (line 110) * xattr, set in ISO image, -setfattr_list: Manip. (line 126) * xattr, set in ISO image, -setfattr_r: Manip. (line 123) @@ -4069,45 +4064,45 @@ Node: Dialog21266 Node: Options22923 Node: AqDrive24491 Node: Loading27397 -Node: Insert39832 -Node: SetInsert48189 -Node: Manip56756 -Node: CmdFind64632 -Node: Filter73977 -Node: Writing78326 -Node: SetWrite84615 -Node: Bootable94899 -Node: Charset102647 -Node: Exception105401 -Node: DialogCtl109916 -Node: Inquiry112261 -Node: Navigate116401 -Node: Verify123755 -Node: Restore132175 -Node: Emulation138831 -Node: Scripting145704 -Node: Frontend151266 -Node: Examples152467 -Node: ExDevices153636 -Node: ExCreate154270 -Node: ExDialog155544 -Node: ExGrowing156806 -Node: ExModifying157608 -Node: ExBootable158109 -Node: ExCharset158656 -Node: ExPseudo159484 -Node: ExCdrecord160378 -Node: ExMkisofs160693 -Node: ExGrowisofs161696 -Node: ExException162820 -Node: ExTime163274 -Node: ExIncBackup163733 -Node: ExRestore167205 -Node: ExRecovery168174 -Node: Files168740 -Node: Seealso169778 -Node: Legal170302 -Node: CommandIdx171224 -Node: ConceptIdx184525 +Node: Insert39576 +Node: SetInsert47933 +Node: Manip56500 +Node: CmdFind64376 +Node: Filter73721 +Node: Writing78070 +Node: SetWrite84359 +Node: Bootable94643 +Node: Charset102391 +Node: Exception105145 +Node: DialogCtl109660 +Node: Inquiry112005 +Node: Navigate116145 +Node: Verify123499 +Node: Restore131919 +Node: Emulation138575 +Node: Scripting145448 +Node: Frontend151010 +Node: Examples152211 +Node: ExDevices153380 +Node: ExCreate154014 +Node: ExDialog155288 +Node: ExGrowing156550 +Node: ExModifying157352 +Node: ExBootable157853 +Node: ExCharset158400 +Node: ExPseudo159228 +Node: ExCdrecord160122 +Node: ExMkisofs160437 +Node: ExGrowisofs161440 +Node: ExException162564 +Node: ExTime163018 +Node: ExIncBackup163477 +Node: ExRestore166949 +Node: ExRecovery167918 +Node: Files168484 +Node: Seealso169522 +Node: Legal170046 +Node: CommandIdx170968 +Node: ConceptIdx184269  End Tag Table diff --git a/xorriso/xorriso.texi b/xorriso/xorriso.texi index 81d46515..4a73b964 100644 --- a/xorriso/xorriso.texi +++ b/xorriso/xorriso.texi @@ -937,10 +937,11 @@ are both in effect. This restricts hard linking to other files restored by the same single extract command. -hardlinks "normal_extract" re-enables wide and expensive hardlink accumulation. @* -Hardlink processing automatically enables @strong{-compliance new_rr}. -This may be overridden by a following -compliance old_rr . In this case -the resulting image will violate the RRIP-1.10 specs for entry PX in -the same way as mkisofs does. +@c B00613 : disabled because implemented faulty from beginning: +@c Hardlink processing automatically enables @strong{-compliance new_rr}. +@c This may be overridden by a following -compliance old_rr . In this case +@c the resulting image will violate the RRIP-1.10 specs for entry PX in +@c the same way as mkisofs does. @c man .TP @item -acl "on"|"off" @kindex -acl controls handling of ACLs diff --git a/xorriso/xorriso_timestamp.h b/xorriso/xorriso_timestamp.h index 07782371..2142498c 100644 --- a/xorriso/xorriso_timestamp.h +++ b/xorriso/xorriso_timestamp.h @@ -1 +1 @@ -#define Xorriso_timestamP "2010.06.13.110316" +#define Xorriso_timestamP "2010.06.13.133537"