diff --git a/libisoburn/trunk/xorriso/base_obj.c b/libisoburn/trunk/xorriso/base_obj.c index 0f0a6891..070e5083 100644 --- a/libisoburn/trunk/xorriso/base_obj.c +++ b/libisoburn/trunk/xorriso/base_obj.c @@ -270,6 +270,7 @@ int Xorriso_new(struct XorrisO ** xorriso,char *progname, int flag) m->do_concat_split= 1; m->do_auto_chmod= 0; m->do_restore_sort_lba= 0; + m->do_strict_acl= 0; m->dialog= 0; m->bsl_interpretation= 0; m->search_mode= 0; diff --git a/libisoburn/trunk/xorriso/opts_d_h.c b/libisoburn/trunk/xorriso/opts_d_h.c index a71a0908..4b28b50a 100644 --- a/libisoburn/trunk/xorriso/opts_d_h.c +++ b/libisoburn/trunk/xorriso/opts_d_h.c @@ -1822,6 +1822,7 @@ int Xorriso_option_help(struct XorrisO *xorriso, int flag) " [:\"concat_split_on\"|\"concat_split_off\"]", " [:\"auto_chmod_on\"|\"auto_chmod_off\"]", " [:\"sort_lba_on\"|\"sort_lba_off\"]", +" [:\"strict_acl_on\"|\"strict_acl_off\"]", " By default \"off\" the inverse operation of xorriso from ISO", " image to disk filesystem is disabled. \"on\" allows xorriso", " to create, overwrite, delete files in the disk filesystem.", diff --git a/libisoburn/trunk/xorriso/opts_i_o.c b/libisoburn/trunk/xorriso/opts_i_o.c index 6d5fb727..f3ece124 100644 --- a/libisoburn/trunk/xorriso/opts_i_o.c +++ b/libisoburn/trunk/xorriso/opts_i_o.c @@ -1250,30 +1250,34 @@ int Xorriso_option_osirrox(struct XorrisO *xorriso, char *mode, int flag) l= npt-cpt; if(l==0 && mode[0]!=0) goto unknown_mode; - if(strncmp(cpt, "off", l)==0) + if(strncmp(cpt, "off", l)==0 && l >= 3) allow_restore= 0; - else if(strncmp(cpt, "banned", l)==0) + else if(strncmp(cpt, "banned", l)==0 && l >= 5) allow_restore= -1; - else if(strncmp(cpt, "device_files", l)==0) + else if(strncmp(cpt, "device_files", l)==0 && l >= 12) allow_restore= 2; - else if(strncmp(cpt, "on", l)==0 || mode[0]==0) + else if((strncmp(cpt, "on", l)==0 && l >= 2) || mode[0]==0) allow_restore= 1; - else if(strncmp(cpt, "concat_split_on", l)==0) + else if(strncmp(cpt, "concat_split_on", l)==0 && l >= 15) xorriso->do_concat_split= 1; - else if(strncmp(cpt, "concat_split_off", l)==0) + else if(strncmp(cpt, "concat_split_off", l)==0 && l >= 16) xorriso->do_concat_split= 0; - else if(strncmp(cpt, "auto_chmod_on", l)==0) + else if(strncmp(cpt, "auto_chmod_on", l)==0 && l >= 13) xorriso->do_auto_chmod= 1; - else if(strncmp(cpt, "auto_chmod_off", l)==0) + else if(strncmp(cpt, "auto_chmod_off", l)==0 && l >= 14) xorriso->do_auto_chmod= 0; - else if(strncmp(cpt, "sort_lba_on", l)==0) + else if(strncmp(cpt, "sort_lba_on", l)==0 && l >= 11) xorriso->do_restore_sort_lba= 1; - else if(strncmp(cpt, "sort_lba_off", l)==0) + else if(strncmp(cpt, "sort_lba_off", l)==0 && l >= 12) xorriso->do_restore_sort_lba= 0; - else if(strncmp(cpt, "o_excl_off", l)==0) - xorriso->drives_exclusive= 0; - else if(strncmp(cpt, "o_excl_on", l)==0) + else if(strncmp(cpt, "o_excl_on", l)==0 && l >= 9) xorriso->drives_exclusive= 1; + else if(strncmp(cpt, "o_excl_off", l)==0 && l >= 10) + xorriso->drives_exclusive= 0; + else if(strncmp(cpt, "strict_acl_on", l)==0 && l >= 13) + xorriso->do_strict_acl|= 1; + else if(strncmp(cpt, "strict_acl_off", l)==0 && l >= 14) + xorriso->do_strict_acl&= ~1; else { unknown_mode:; sprintf(xorriso->info_text, "-osirrox: unknown mode '%s'", cpt); diff --git a/libisoburn/trunk/xorriso/read_run.c b/libisoburn/trunk/xorriso/read_run.c index aa753b5d..f1192a14 100644 --- a/libisoburn/trunk/xorriso/read_run.c +++ b/libisoburn/trunk/xorriso/read_run.c @@ -283,7 +283,7 @@ int Xorriso_restore_properties(struct XorrisO *xorriso, char *disk_path, } if(num_attrs > 0) { ret= iso_local_set_attrs(disk_path, num_attrs, names, value_lengths, - values, 0); + values, (!(xorriso->do_strict_acl & 1)) << 6); if(ret < 0) { errno_copy= errno; if(ret != (int) ISO_AAIP_NO_SET_LOCAL) diff --git a/libisoburn/trunk/xorriso/xorriso.1 b/libisoburn/trunk/xorriso/xorriso.1 index 716a6b9e..b13ffd25 100644 --- a/libisoburn/trunk/xorriso/xorriso.1 +++ b/libisoburn/trunk/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.1.5, Aug 18, 2011" +.TH XORRISO 1 "Version 1.1.5, Aug 23, 2011" .\" Please adjust this date whenever revising the manpage. .\" .\" Some roff macros, for reference: @@ -423,8 +423,11 @@ Files with ACL show as group permissions the setting of entry "mask::" if that entry exists. Nevertheless the non\-listed group members get handled according to entry "group::". When removing ACL from a file, \fBxorriso\fR brings "group::" into effect. +.br +Recording and restoring of ACLs from and to local files works currently +only on GNU/Linux and FreeBSD. .PP -\fBxattr\fR (aka EA) +\fBxattr\fR (aka EA, or extattr) are pairs of name and value which can be attached to file objects. AAIP is able to represent them and \fBxorriso\fR allows to record and restore pairs which @@ -437,6 +440,9 @@ xattr processing happens only if it is enabled by option As with ACL, currently only \fBxorriso\fR is able to retrieve xattr from AAIP enhanced images, to restore them to xattr capable file systems, or to print them. +.br +Recording and restoring of xattr from and to local files works currently +only on GNU/Linux and FreeBSD, where they are known as extattr. .SS .B Command processing: .br @@ -3597,6 +3603,10 @@ Option "o_excl_off" allows on GNU/Linux to access such drives. Drives which get acquired while "o_excl_off" will refuse to get blanked, formatted, written, or ejected. But be aware that even harmless inquiries can spoil ongoing burns of CD\-R[W] and DVD\-R[W]. +.br +Option "strict_acl_off" is default. It tolerates on FreeBSD the presence of +directory "default" ACLs in the ISO image. With "strict_acl_on" these +GNU/Linux ACLs cause on FreeBSD a FAILURE event during restore with \-acl "on". .TP \fB\-extract\fR iso_rr_path disk_path Copy the file objects at and underneath iso_rr_path to their corresponding @@ -4703,6 +4713,11 @@ ACL and xattr .TP MD5 checksums .BR md5sum(1) +.TP +On FreeBSD the commands for xattr and MD5 differ +.BR getextattr(8), +.BR setextattr(8), +.BR md5(1) .SH BUGS To report bugs, request help, or suggest enhancements for \fBxorriso\fR, please send electronic mail to the public list . diff --git a/libisoburn/trunk/xorriso/xorriso.info b/libisoburn/trunk/xorriso/xorriso.info index 9dc92cb9..3b3ef89c 100644 --- a/libisoburn/trunk/xorriso/xorriso.info +++ b/libisoburn/trunk/xorriso/xorriso.info @@ -369,17 +369,21 @@ Files with ACL show as group permissions the setting of entry "mask::" if that entry exists. Nevertheless the non-listed group members get handled according to entry "group::". When removing ACL from a file, `xorriso' brings "group::" into effect. +Recording and restoring of ACLs from and to local files works currently +only on GNU/Linux and FreeBSD. - *xattr* (aka EA) are pairs of name and value which can be attached -to file objects. AAIP is able to represent them and `xorriso' allows to -record and restore pairs which have names out of the user namespace. -I.e. those which begin with "user.", like "user.x" or "user.whatever". -Name has to be a 0 terminated string. Value may be any array of bytes -which does not exceed the size of 4095 bytes. xattr processing happens -only if it is enabled by option *-xattr*. + *xattr* (aka EA, or extattr) are pairs of name and value which can +be attached to file objects. AAIP is able to represent them and +`xorriso' allows to record and restore pairs which have names out of +the user namespace. I.e. those which begin with "user.", like "user.x" +or "user.whatever". Name has to be a 0 terminated string. Value may be +any array of bytes which does not exceed the size of 4095 bytes. xattr +processing happens only if it is enabled by option *-xattr*. As with ACL, currently only `xorriso' is able to retrieve xattr from AAIP enhanced images, to restore them to xattr capable file systems, or to print them. +Recording and restoring of xattr from and to local files works currently +only on GNU/Linux and FreeBSD, where they are known as extattr.  File: xorriso.info, Node: Processing, Next: Dialog, Prev: Extras, Up: Top @@ -3169,6 +3173,10 @@ The directory permissions on disk have to allow rwx. Drives which get acquired while "o_excl_off" will refuse to get blanked, formatted, written, or ejected. But be aware that even harmless inquiries can spoil ongoing burns of CD-R[W] and DVD-R[W]. + Option "strict_acl_off" is default. It tolerates on FreeBSD the + presence of directory "default" ACLs in the ISO image. With + "strict_acl_on" these GNU/Linux ACLs cause on FreeBSD a FAILURE + event during restore with -acl "on". -extract iso_rr_path disk_path Copy the file objects at and underneath iso_rr_path to their @@ -4156,6 +4164,9 @@ ACL and xattr MD5 checksums md5sum(1) +On FreeBSD some commands differ: + getextattr(8), setextattr(8), md5(1) +  File: xorriso.info, Node: Bugreport, Next: Legal, Prev: Seealso, Up: Top @@ -4257,10 +4268,10 @@ File: xorriso.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: Top * -compliance controls standard compliance: SetWrite. (line 14) * -copyright_file sets copyright file name: SetWrite. (line 154) * -cp_clone copies ISO directory tree: Insert. (line 183) -* -cp_rx copies file trees to disk: Restore. (line 104) -* -cpax copies files to disk: Restore. (line 100) +* -cp_rx copies file trees to disk: Restore. (line 108) +* -cpax copies files to disk: Restore. (line 104) * -cpr inserts like with cp -r: Insert. (line 152) -* -cpx copies files to disk: Restore. (line 88) +* -cpx copies files to disk: Restore. (line 92) * -cut_out inserts piece of data file: Insert. (line 126) * -dev aquires one drive for input and output: AqDrive. (line 12) * -device_links gets list of drives: Inquiry. (line 18) @@ -4284,10 +4295,10 @@ File: xorriso.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: Top * -error_behavior controls error workarounds: Exception. (line 96) * -external_filter registers data filter: Filter. (line 20) * -external_filter unregisters data filter: Filter. (line 48) -* -extract copies file tree to disk: Restore. (line 56) -* -extract_cut copies file piece to disk: Restore. (line 77) -* -extract_l copies files to disk: Restore. (line 72) -* -extract_single copies file to disk: Restore. (line 68) +* -extract copies file tree to disk: Restore. (line 60) +* -extract_cut copies file piece to disk: Restore. (line 81) +* -extract_l copies files to disk: Restore. (line 76) +* -extract_single copies file to disk: Restore. (line 72) * -file_size_limit limits data file size: SetInsert. (line 7) * -find traverses and alters ISO tree: CmdFind. (line 7) * -findx traverses disk tree: Navigate. (line 106) @@ -4333,7 +4344,7 @@ File: xorriso.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: Top * -mark sets synchronizing message: Frontend. (line 25) * -md5 controls handling of MD5 sums: Loading. (line 155) * -mkdir creates ISO directory: Insert. (line 166) -* -mount issues mount command for ISO session: Restore. (line 122) +* -mount issues mount command for ISO session: Restore. (line 126) * -mount_cmd composes mount command line: Inquiry. (line 41) * -mount_cmd controls mount command: Inquiry. (line 57) * -mv renames file in ISO image: Manip. (line 35) @@ -4350,7 +4361,7 @@ File: xorriso.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: Top * -pacifier controls pacifier text form: Emulation. (line 158) * -padding sets amount or mode of image padding: SetWrite. (line 268) * -page set terminal geometry: DialogCtl. (line 19) -* -paste_in copies file into disk file: Restore. (line 117) +* -paste_in copies file into disk file: Restore. (line 121) * -path_list inserts paths from disk file: Insert. (line 75) * -pathspecs sets meaning of = with -add: SetInsert. (line 118) * -pkt_output consolidates text output: Frontend. (line 7) @@ -4484,6 +4495,7 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top * Drive, reduce activity, -calm_drive: Loading. (line 235) * Drive, report SCSI commands, -scsi_log: Scripting. (line 143) * Drive, write and eject, -commit_eject: Writing. (line 40) +* EA, _definiton: Extras. (line 54) * El Torito, _definiton: Extras. (line 19) * Emulation, -as: Emulation. (line 13) * Emulation, .mkisofsrc, -read_mkisofsrc: Emulation. (line 146) @@ -4491,6 +4503,7 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top * Emulation, mkisofs, -as: Emulation. (line 16) * Emulation, pacifier form, -pacifier: Emulation. (line 158) * Examples: Examples. (line 6) +* extattr, _definiton: Extras. (line 54) * Filter, _definition: Filter. (line 6) * Filter, apply to file tree, -set_filter_r: Filter. (line 85) * Filter, apply to file, -set_filter: Filter. (line 60) @@ -4619,20 +4632,20 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top * Quoted input, _definiton: Processing. (line 42) * Recovery, retrieve blocks, -check_media: Verify. (line 21) * Rename, in ISO image, -mv: Manip. (line 35) -* Restore, copy file into disk file, -paste_in: Restore. (line 117) -* Restore, copy file piece to disk, -extract_cut: Restore. (line 77) -* Restore, copy file to disk, -extract_single: Restore. (line 68) -* Restore, copy file tree to disk, -extract: Restore. (line 56) -* Restore, copy file trees to disk, -cp_rx: Restore. (line 104) -* Restore, copy files to disk, -cpax: Restore. (line 100) -* Restore, copy files to disk, -cpx: Restore. (line 88) -* Restore, copy files to disk, -extract_l: Restore. (line 72) +* Restore, copy file into disk file, -paste_in: Restore. (line 121) +* Restore, copy file piece to disk, -extract_cut: Restore. (line 81) +* Restore, copy file to disk, -extract_single: Restore. (line 72) +* Restore, copy file tree to disk, -extract: Restore. (line 60) +* Restore, copy file trees to disk, -cp_rx: Restore. (line 108) +* Restore, copy files to disk, -cpax: Restore. (line 104) +* Restore, copy files to disk, -cpx: Restore. (line 92) +* Restore, copy files to disk, -extract_l: Restore. (line 76) * Restore, enable ISO-to-disk, -osirrox: Restore. (line 18) * Rock Ridge, _definiton: Extras. (line 6) * Session, _definition: Model. (line 6) * Session, altered start address, -displacement: Loading. (line 35) * Session, info string, -session_string: Inquiry. (line 66) -* Session, issue mount command, -mount: Restore. (line 122) +* Session, issue mount command, -mount: Restore. (line 126) * Session, log when written, -session_log: Scripting. (line 134) * Session, mount command line, -mount_cmd: Inquiry. (line 41) * Session, mount parameters, -mount_opts: Inquiry. (line 57) @@ -4669,7 +4682,7 @@ File: xorriso.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top * Write, predict image size, -print_size: Inquiry. (line 79) * Write, set speed, -speed: SetWrite. (line 211) * Write, simulation, -dummy: SetWrite. (line 251) -* xattr, _definiton: Extras. (line 52) +* xattr, _definiton: Extras. (line 54) * xattr, control handling, -xattr: Loading. (line 150) * xattr, set in ISO image, -setfattr: Manip. (line 111) * xattr, set in ISO image, -setfattr_list: Manip. (line 127) @@ -4687,52 +4700,52 @@ Node: Media6148 Node: Methods8814 Node: Drives11363 Node: Extras14676 -Node: Processing18141 -Node: Dialog21611 -Node: Options23274 -Node: AqDrive24882 -Node: Loading27919 -Node: Insert42186 -Node: SetInsert51891 -Node: Manip60459 -Node: CmdFind69186 -Node: Filter80448 -Node: Writing84786 -Node: SetWrite92779 -Node: Bootable106825 -Node: Jigdo120043 -Node: Charset124289 -Node: Exception127048 -Node: DialogCtl133161 -Node: Inquiry135748 -Node: Navigate140592 -Node: Verify148560 -Node: Restore157225 -Node: Emulation163885 -Node: Scripting173688 -Node: Frontend180698 -Node: Examples181997 -Node: ExDevices183168 -Node: ExCreate183827 -Node: ExDialog185101 -Node: ExGrowing186363 -Node: ExModifying187165 -Node: ExBootable187666 -Node: ExCharset188215 -Node: ExPseudo189035 -Node: ExCdrecord189933 -Node: ExMkisofs190248 -Node: ExGrowisofs191586 -Node: ExException192721 -Node: ExTime193175 -Node: ExIncBackup193634 -Node: ExRestore197558 -Node: ExRecovery198516 -Node: Files199084 -Node: Seealso200382 -Node: Bugreport200970 -Node: Legal201551 -Node: CommandIdx202481 -Node: ConceptIdx217504 +Node: Processing18393 +Node: Dialog21863 +Node: Options23526 +Node: AqDrive25134 +Node: Loading28171 +Node: Insert42438 +Node: SetInsert52143 +Node: Manip60711 +Node: CmdFind69438 +Node: Filter80700 +Node: Writing85038 +Node: SetWrite93031 +Node: Bootable107077 +Node: Jigdo120295 +Node: Charset124541 +Node: Exception127300 +Node: DialogCtl133413 +Node: Inquiry136000 +Node: Navigate140844 +Node: Verify148812 +Node: Restore157477 +Node: Emulation164382 +Node: Scripting174185 +Node: Frontend181195 +Node: Examples182494 +Node: ExDevices183665 +Node: ExCreate184324 +Node: ExDialog185598 +Node: ExGrowing186860 +Node: ExModifying187662 +Node: ExBootable188163 +Node: ExCharset188712 +Node: ExPseudo189532 +Node: ExCdrecord190430 +Node: ExMkisofs190745 +Node: ExGrowisofs192083 +Node: ExException193218 +Node: ExTime193672 +Node: ExIncBackup194131 +Node: ExRestore198055 +Node: ExRecovery199013 +Node: Files199581 +Node: Seealso200879 +Node: Bugreport201543 +Node: Legal202124 +Node: CommandIdx203054 +Node: ConceptIdx218077  End Tag Table diff --git a/libisoburn/trunk/xorriso/xorriso.texi b/libisoburn/trunk/xorriso/xorriso.texi index 9205cf05..7ab257cc 100644 --- a/libisoburn/trunk/xorriso/xorriso.texi +++ b/libisoburn/trunk/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.1.5, Aug 18, 2011" +@c man .TH XORRISO 1 "Version 1.1.5, Aug 23, 2011" @c man .\" Please adjust this date whenever revising the manpage. @c man .\" @c man .\" Some roff macros, for reference: @@ -561,10 +561,15 @@ Files with ACL show as group permissions the setting of entry "mask::" if that entry exists. Nevertheless the non-listed group members get handled according to entry "group::". When removing ACL from a file, @command{xorriso} brings "group::" into effect. +@* +Recording and restoring of ACLs from and to local files works currently +only on GNU/Linux and FreeBSD. @c man .PP @sp 1 @cindex xattr, _definiton -@strong{xattr} (aka EA) +@cindex EA, _definiton +@cindex extattr, _definiton +@strong{xattr} (aka EA, or extattr) are pairs of name and value which can be attached to file objects. AAIP is able to represent them and @command{xorriso} allows to record and restore pairs which @@ -577,6 +582,9 @@ xattr processing happens only if it is enabled by option As with ACL, currently only @command{xorriso} is able to retrieve xattr from AAIP enhanced images, to restore them to xattr capable file systems, or to print them. +@* +Recording and restoring of xattr from and to local files works currently +only on GNU/Linux and FreeBSD, where they are known as extattr. @c man .SS @node Processing, Dialog, Extras, top @chapter Command processing @@ -4241,6 +4249,10 @@ Option "o_excl_off" allows on GNU/Linux to access such drives. Drives which get acquired while "o_excl_off" will refuse to get blanked, formatted, written, or ejected. But be aware that even harmless inquiries can spoil ongoing burns of CD-R[W] and DVD-R[W]. +@* +Option "strict_acl_off" is default. It tolerates on FreeBSD the presence of +directory "default" ACLs in the ISO image. With "strict_acl_on" these +GNU/Linux ACLs cause on FreeBSD a FAILURE event during restore with -acl "on". @c man .TP @item -extract iso_rr_path disk_path @kindex -extract copies file tree to disk @@ -5610,6 +5622,11 @@ The default setting of -check_media abort_file= is: @c man .TP @c man MD5 checksums @c man .BR md5sum(1) +@c man .TP +@c man On FreeBSD the commands for xattr and MD5 differ +@c man .BR getextattr(8), +@c man .BR setextattr(8), +@c man .BR md5(1) @c man-ignore-lines begin @node Seealso, Bugreport, Files, Top @chapter See also @@ -5635,6 +5652,10 @@ getfattr(1), setfattr(1) @item MD5 checksums md5sum(1) +@item On FreeBSD some commands differ: +getextattr(8), +setextattr(8), +md5(1) @end table @c man-ignore-lines end @c man .SH BUGS diff --git a/libisoburn/trunk/xorriso/xorriso_private.h b/libisoburn/trunk/xorriso/xorriso_private.h index 03043663..587247f5 100644 --- a/libisoburn/trunk/xorriso/xorriso_private.h +++ b/libisoburn/trunk/xorriso/xorriso_private.h @@ -429,6 +429,10 @@ struct XorrisO { /* the global context of xorriso */ tree traversal. Better read performance, no directory mtime restore, needs do_auto_chmod */ + int do_strict_acl; /* bit0= do not tolerate inappropriate presence or + absence of directory "default" ACL + */ + int mount_opts_flag; /* bit0= "shared" = not "exclusive" Try to emit non-exclusive mount command. Do not give up drives. diff --git a/libisoburn/trunk/xorriso/xorriso_timestamp.h b/libisoburn/trunk/xorriso/xorriso_timestamp.h index 441fe787..0f12e9c8 100644 --- a/libisoburn/trunk/xorriso/xorriso_timestamp.h +++ b/libisoburn/trunk/xorriso/xorriso_timestamp.h @@ -1 +1 @@ -#define Xorriso_timestamP "2011.08.19.110340" +#define Xorriso_timestamP "2011.08.23.104121" diff --git a/libisoburn/trunk/xorriso/xorrisofs.1 b/libisoburn/trunk/xorriso/xorrisofs.1 index 7610b9d4..cc26de61 100644 --- a/libisoburn/trunk/xorriso/xorrisofs.1 +++ b/libisoburn/trunk/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.1.5, Aug 8, 2011" +.TH XORRISOFS 1 "Version 1.1.5, Aug 22, 2011" .\" Please adjust this date whenever revising the manpage. .\" .\" Some roff macros, for reference: @@ -499,16 +499,18 @@ Enable options which improve backup fidelity: .TP \fB--acl\fR .br -Enable recording and loading of GNU/Linux ACLs (see man getfacl, man acl). +Enable recording and loading of ACLs from GNU/Linux or FreeBSD +(see man getfacl, man acl). They will not be in effect with mounted ISO images. But xorriso can -restore them when extracting files from the ISO image. +restore them on the same systems when extracting files from the ISO image. .TP \fB--xattr\fR .br -Enable recording and loading of GNU/Linux extended attributes in -user namespace (see man getfattr, man attr). +Enable recording and loading of GNU/Linux or FreeBSD extended attributes in +user namespace (see man getfattr, man attr, +resp. man getextattr, man 9 extattr). They will not be in effect with mounted ISO images. But xorriso can -restore them when extracting files from the ISO image. +restore them on the same systems when extracting files from the ISO image. .TP \fB--md5\fR .br @@ -1494,6 +1496,11 @@ ACL and xattr .TP MD5 checksums .BR md5sum(1) +.TP +On FreeBSD the commands for xattr and MD5 differ +.BR getextattr(8), +.BR setextattr(8), +.BR md5(1) .SH BUGS To report bugs, request help, or suggest enhancements for \fBxorriso\fR, please send electronic mail to the public list . diff --git a/libisoburn/trunk/xorriso/xorrisofs.texi b/libisoburn/trunk/xorriso/xorrisofs.texi index 35bccf18..6cbf16c5 100644 --- a/libisoburn/trunk/xorriso/xorrisofs.texi +++ b/libisoburn/trunk/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.1.5, Aug 8, 2011" +@c man .TH XORRISOFS 1 "Version 1.1.5, Aug 22, 2011" @c man .\" Please adjust this date whenever revising the manpage. @c man .\" @c man .\" Some roff macros, for reference: @@ -734,18 +734,20 @@ Enable options which improve backup fidelity: @kindex @minus{}@minus{}acl Recording of ACLs @cindex ACL, record and load, @minus{}@minus{}acl @* -Enable recording and loading of GNU/Linux ACLs (see man getfacl, man acl). +Enable recording and loading of ACLs from GNU/Linux or FreeBSD +(see man getfacl, man acl). They will not be in effect with mounted ISO images. But xorriso can -restore them when extracting files from the ISO image. +restore them on the same systems when extracting files from the ISO image. @c man .TP @item @minus{}@minus{}xattr @kindex @minus{}@minus{}xattr Recording of xattr @cindex xattr, record and load, @minus{}@minus{}xattr @* -Enable recording and loading of GNU/Linux extended attributes in -user namespace (see man getfattr, man attr). +Enable recording and loading of GNU/Linux or FreeBSD extended attributes in +user namespace (see man getfattr, man attr, +resp. man getextattr, man 9 extattr). They will not be in effect with mounted ISO images. But xorriso can -restore them when extracting files from the ISO image. +restore them on the same systems when extracting files from the ISO image. @c man .TP @item @minus{}@minus{}md5 @kindex @minus{}@minus{}md5 Recording of MD5 checksums @@ -1997,6 +1999,11 @@ Any other lines will be silently ignored. @c man .TP @c man MD5 checksums @c man .BR md5sum(1) +@c man .TP +@c man On FreeBSD the commands for xattr and MD5 differ +@c man .BR getextattr(8), +@c man .BR setextattr(8), +@c man .BR md5(1) @c man-ignore-lines begin @node Seealso, Bugreport, Files, Top @chapter See also @@ -2021,6 +2028,10 @@ getfattr(1), setfattr(1) @item MD5 checksums md5sum(1) +@item On FreeBSD some commands differ: +getextattr(8), +setextattr(8), +md5(1) @end table @c man-ignore-lines end @c man .SH BUGS