libburnia/libisoburn
2
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Letting -as mkisofs --norock revoke the special effect of -r

Browse Source
This commit is contained in:
Thomas Schmitt
2016-04-27 09:29:51 +00:00
parent 06b1104c6a
commit a852218e61
5 changed files with 98 additions and 78 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
xorriso/emulators.c
View File

@ -1688,6 +1688,7 @@ illegal_c:;
/* was already handled in first argument scan */;
} else if(strcmp(argpt, "--norock")==0) {
xorriso->do_rockridge= 0;
lower_r= 0;
} else if(strcmp(argpt, "-R")==0 || strcmp(argpt, "-rock")==0) {
ret= Xorriso_genisofs_fused_options(xorriso, whom, "R",
&option_d, &iso_level, &lower_r, ra_text, 0);

2
xorriso/xorriso_timestamp.h
View File

@ -1 +1 @@
#define Xorriso_timestamP "2016.04.25.100906"
#define Xorriso_timestamP "2016.04.27.092902"

13
xorriso/xorrisofs.1
View File

@ -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.4.3, Jan 26, 2016"
.TH XORRISOFS 1 "Version 1.4.3, Apr 27, 2016"
.\" Please adjust this date whenever revising the manpage.
.\"
.\" Some roff macros, for reference:
@ -536,10 +536,15 @@ Alias of \-R.
.TP
\fB\-r\fR
.br
Set Rock Ridge user and group id of all files in the ISO image to 0.
Enable Rock Ridge and set user and group id of all files in the ISO image to 0.
Grant r\-permissions to all. Deny all w\-permissions.
If any x\-permission is set, grant x\-permission to all.
Remove s\-bit and t\-bit.
.br
These attribute changes stay delayed until mkisofs emulation ends. Within the
same \-as mkisofs emulation command they can be revoked by a subsequent
option \-\-norock. For compatibility reasons, option \-R does not
revoke the changes ordered by \-r.
.TP
\fB\-rational-rock\fR
Alias of \-r.
@ -549,7 +554,9 @@ Alias of \-r.
This option disables the production of Rock Ridge extensions for the
ISO 9660 file objects. The multi\-session capabilities of \fBxorrisofs\fR
depend much on the naming fidelity of Rock Ridge. So it is strongly
discouraged to disable it by this option.
discouraged to disable it by this option, except for the special use case
to revoke the effect of \-r by :
\-\-norock \-R
.TP
\fB\-file_name_limit\fR number
Set the maximum permissible length for file names in the range of 64 to 255.

147
xorriso/xorrisofs.info
View File

@ -504,10 +504,14 @@ File: xorrisofs.info, Node: SetExtras, Next: SetHide, Prev: SetCompl, Up: Op
Alias of -R.
-r
Set Rock Ridge user and group id of all files in the ISO image to
0. Grant r-permissions to all. Deny all w-permissions. If any
x-permission is set, grant x-permission to all. Remove s-bit and
t-bit.
Enable Rock Ridge and set user and group id of all files in the ISO
image to 0. Grant r-permissions to all. Deny all w-permissions.
If any x-permission is set, grant x-permission to all. Remove
s-bit and t-bit.
These attribute changes stay delayed until mkisofs emulation ends.
Within the same -as mkisofs emulation command they can be revoked
by a subsequent option --norock. For compatibility reasons, option
-R does not revoke the changes ordered by -r.
-rational-rock
Alias of -r.
--norock
@ -515,7 +519,8 @@ File: xorrisofs.info, Node: SetExtras, Next: SetHide, Prev: SetCompl, Up: Op
This option disables the production of Rock Ridge extensions for
the ISO 9660 file objects. The multi-session capabilities of
'xorrisofs' depend much on the naming fidelity of Rock Ridge. So
it is strongly discouraged to disable it by this option.
it is strongly discouraged to disable it by this option, except for
the special use case to revoke the effect of -r by : --norock -R
-file_name_limit number
Set the maximum permissible length for file names in the range of
64 to 255. Path components which are longer than the given number
@ -1818,23 +1823,23 @@ File: xorrisofs.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: T
[index]
* Menu:
* --acl Recording of ACLs: SetExtras. (line 76)
* --acl Recording of ACLs: SetExtras. (line 81)
* --application_use set Application Use field: ImageId. (line 77)
* --boot-catalog-hide Hide El Torito boot catalog: Bootable. (line 101)
* --efi-boot El Torito EFI boot image: Bootable. (line 53)
* --embedded-boot Fill System Area e.g. by MBR: SystemArea. (line 75)
* --emul-toc enable table-of-content emulation: SetProduct. (line 33)
* --for_backup Enable backup fidelity: SetExtras. (line 73)
* --for_backup Enable backup fidelity: SetExtras. (line 78)
* --grub2-boot-info Patch El Torito boot image: Bootable. (line 89)
* --grub2-mbr Install modern GRUB2 MBR: SystemArea. (line 77)
* --grub2-sparc-core SUN SPARC core file: SystemArea. (line 258)
* --hardlinks Recording of hardlink relations: SetExtras. (line 97)
* --hardlinks Recording of hardlink relations: SetExtras. (line 102)
* --mbr-force-bootable Enforce MBR bootable/active flag: SystemArea.
(line 127)
* --md5 Recording of MD5 checksums: SetExtras. (line 89)
* --md5 Recording of MD5 checksums: SetExtras. (line 94)
* --modification-date set ISO image timestamps: ImageId. (line 70)
* --no-emul-toc no table-of-content emulation: SetProduct. (line 41)
* --norock disable Rock Ridge production: SetExtras. (line 24)
* --norock disable Rock Ridge production: SetExtras. (line 28)
* --no_rc do not execute startup files: Miscellaneous. (line 18)
* --old-empty old block addresses for empty files: SetProduct.
(line 97)
@ -1847,7 +1852,7 @@ File: xorrisofs.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: T
(line 123)
* --quoted_path_list read pathspecs from disk file: SetInsert.
(line 12)
* --scdbackup_tag Recording of MD5 checksum: SetExtras. (line 105)
* --scdbackup_tag Recording of MD5 checksum: SetExtras. (line 110)
* --sort-weight set block address sorting weight: SetProduct. (line 45)
* --sort-weight-list set block address sorting weight: SetProduct.
(line 56)
@ -1855,7 +1860,7 @@ File: xorrisofs.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: T
(line 76)
* --stdio_sync control forced output to disk files: SetProduct.
(line 23)
* --xattr Recording of xattr: SetExtras. (line 82)
* --xattr Recording of xattr: SetExtras. (line 87)
* -A set Application Id: ImageId. (line 34)
* -abstract set Abstract File path: ImageId. (line 57)
* -allow-lowercase lowercase in ISO file names: SetCompl. (line 42)
@ -1882,12 +1887,12 @@ File: xorrisofs.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: T
* -chrp-boot CHRP partition: SystemArea. (line 225)
* -chrp-boot-part CHRP partition: SystemArea. (line 216)
* -copyright set Copyright File path: ImageId. (line 66)
* -D allow deep directory hierachies: SetExtras. (line 41)
* -D allow deep directory hierachies: SetExtras. (line 46)
* -d omit trailing dot in ISO file names: SetCompl. (line 50)
* -dev set path for loading existing ISO image: Loading. (line 23)
* -dir-mode permissions for all directories: SetProduct. (line 79)
* -disable-deep-relocation allow deep directory hierachies: SetExtras.
(line 53)
(line 58)
* -disallow_dir_id_ext enforce ISO level 1 directory names: SetCompl.
(line 23)
* -e El Torito EFI boot image: Bootable. (line 47)
@ -1902,7 +1907,7 @@ File: xorrisofs.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: T
* -exclude-list exclude disk files from inserting: SetInsert. (line 44)
* -f follow symbolic links on disk: SetInsert. (line 22)
* -file-mode permissions for all data files: SetProduct. (line 84)
* -file_name_limit curbs length of file names: SetExtras. (line 30)
* -file_name_limit curbs length of file names: SetExtras. (line 35)
* -follow-links follow symbolic links on disk: SetInsert. (line 26)
* -full-iso9660-filenames allow 31 characters in ISO file names: SetCompl.
(line 59)
@ -1913,15 +1918,15 @@ File: xorrisofs.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: T
(line 29)
* -hard-disk-boot El Torito boot image emulation: Bootable. (line 63)
* -help list supported options: Miscellaneous. (line 21)
* -hfs-bless HFS+ blessing ppc_bootdir: SetExtras. (line 181)
* -hfs-bless-by HFS+ blessing: SetExtras. (line 171)
* -hfsplus enable production of HFS+ partition: SetExtras. (line 130)
* -hfsplus-block-size set APM block size: SetExtras. (line 161)
* -hfs-bless HFS+ blessing ppc_bootdir: SetExtras. (line 186)
* -hfs-bless-by HFS+ blessing: SetExtras. (line 176)
* -hfsplus enable production of HFS+ partition: SetExtras. (line 135)
* -hfsplus-block-size set APM block size: SetExtras. (line 166)
* -hfsplus-block-size set HFS+ allocation block size: SetExtras.
(line 157)
(line 162)
* -hfsplus-file-creator-type HFS+ creator-type attribute: SetExtras.
(line 168)
* -hfsplus-serial-no set HFS+ serial number: SetExtras. (line 153)
(line 173)
* -hfsplus-serial-no set HFS+ serial number: SetExtras. (line 158)
* -hide keep matching files invisible in ISO tree: SetHide. (line 8)
* -hide-hfsplus keep matching files invisible in HFS+ tree: SetHide.
(line 25)
@ -1934,7 +1939,7 @@ File: xorrisofs.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: T
* -hide-list keep matching files invisible in ISO tree: SetHide.
(line 15)
* -hide-rr-moved set deep directory relocation target: SetExtras.
(line 71)
(line 76)
* -hppa-bootloader HP-PA bootloader file: SystemArea. (line 270)
* -hppa-cmdline HP-PA PALO command line: SystemArea. (line 264)
* -hppa-hdrversion HP-PA PALO header version: SystemArea. (line 278)
@ -1949,7 +1954,7 @@ File: xorrisofs.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: T
* -isohybrid-gpt-basdat Mark boot image in GPT: SystemArea. (line 94)
* -isohybrid-gpt-hfsplus Mark boot image in GPT: SystemArea. (line 104)
* -isohybrid-mbr Install ISOLINUX isohybrid MBR: SystemArea. (line 83)
* -J enable production of Joliet directory tree: SetExtras. (line 113)
* -J enable production of Joliet directory tree: SetExtras. (line 118)
* -jigdo-exclude add exclusion pattern for .md5: Jigdo. (line 55)
* -jigdo-force-md5 add check pattern for .md5: Jigdo. (line 49)
* -jigdo-jigdo set name of .jigdo file: Jigdo. (line 38)
@ -1959,9 +1964,9 @@ File: xorrisofs.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: T
* -jigdo-template-compress choose compression algorithm: Jigdo.
(line 69)
* -joliet enable production of Joliet directory tree: SetExtras.
(line 117)
* -joliet-long allow longer Joliet names: SetExtras. (line 119)
* -joliet-utf16 use UTF-16 with Joliet names: SetExtras. (line 125)
(line 122)
* -joliet-long allow longer Joliet names: SetExtras. (line 124)
* -joliet-utf16 use UTF-16 with Joliet names: SetExtras. (line 130)
* -l allow 31 characters in ISO file names: SetCompl. (line 56)
* -log-file redirect stderr messages: Miscellaneous. (line 33)
* -m exclude disk files from inserting: SetInsert. (line 31)
@ -2004,13 +2009,13 @@ File: xorrisofs.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: T
* -R Rock Ridge (is enabled by default): SetExtras. (line 8)
* -r Rock Ridge with altered owner and permission: SetExtras. (line 16)
* -rational-rock Rock Ridge with altered owner and permission: SetExtras.
(line 22)
(line 26)
* -relaxed-filenames 7-bit special characters in ISO file names: SetCompl.
(line 45)
* -rock Rock Ridge (is enabled by default): SetExtras. (line 13)
* -root redirect ISO root directory: SetInsert. (line 55)
* -rr_reloc_dir set deep directory relocation target: SetExtras.
(line 55)
(line 60)
* -sparc-boot SUN SPARC boot images: SystemArea. (line 254)
* -sparc-label SUN Disk Label text: SystemArea. (line 256)
* -sysid set System Id: ImageId. (line 43)
@ -2039,12 +2044,12 @@ File: xorrisofs.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top
* Menu:
* Abstract File, set path, -abstract: ImageId. (line 57)
* ACL, record and load, --acl: SetExtras. (line 76)
* ACL, record and load, --acl: SetExtras. (line 81)
* APM, mark appended partitions, -appended_part_as_apm: SystemArea.
(line 200)
* APM, _definition: SystemArea. (line 16)
* Application Id, set, -A, -appid: ImageId. (line 34)
* Backup, enable fidelity, --for_backup: SetExtras. (line 73)
* Backup, enable fidelity, --for_backup: SetExtras. (line 78)
* Biblio File, set path, -biblio: ImageId. (line 62)
* Block address, set sorting weight, --sort-weight: SetProduct.
(line 45)
@ -2115,11 +2120,11 @@ File: xorrisofs.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top
* Character sets, _definition: Charset. (line 6)
* Copyright File, set path, -copyright: ImageId. (line 66)
* Deep directories, allow, -D, -disable-deep-relocation: SetExtras.
(line 41)
(line 46)
* Deep directories, relocation target, -hide-rr-moved: SetExtras.
(line 71)
(line 76)
* Deep directories, relocation target, -rr_reloc_dir: SetExtras.
(line 55)
(line 60)
* Disk files, exclude, -hide-list: SetInsert. (line 44)
* Disk files, exclude, -m, -exclude, -x, -old-exclude: SetInsert.
(line 31)
@ -2127,19 +2132,19 @@ File: xorrisofs.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top
* ECMA-119, _definition: Standards. (line 6)
* El Torito, _definition: Bootable. (line 13)
* Examples: Examples. (line 6)
* File names, curb length, -file_name_limit: SetExtras. (line 30)
* File names, curb length, -file_name_limit: SetExtras. (line 35)
* Forced output, control, --stdio_sync: SetProduct. (line 23)
* GPT, mark appended partitions, -appended_part_as_gpt: SystemArea.
(line 194)
* GPT, _definition: SystemArea. (line 13)
* HFS+, enables production: SetExtras. (line 130)
* HFS+, issue blessing ppc_bootdir, -hfs-bless: SetExtras. (line 181)
* HFS+, issue blessing, -hfs-bless-by: SetExtras. (line 171)
* HFS+, set allocation block size: SetExtras. (line 157)
* HFS+, set APM block size: SetExtras. (line 161)
* HFS+, enables production: SetExtras. (line 135)
* HFS+, issue blessing ppc_bootdir, -hfs-bless: SetExtras. (line 186)
* HFS+, issue blessing, -hfs-bless-by: SetExtras. (line 176)
* HFS+, set allocation block size: SetExtras. (line 162)
* HFS+, set APM block size: SetExtras. (line 166)
* HFS+, set creator and type of file, -hfsplus-file-creator-type: SetExtras.
(line 168)
* HFS+, set serial number: SetExtras. (line 153)
(line 173)
* HFS+, set serial number: SetExtras. (line 158)
* HFS+, _definition: Standards. (line 32)
* Hiding, from HFS+, -hide-hfsplus: SetHide. (line 25)
* Hiding, from HFS+, -hide-hfsplus-list: SetHide. (line 28)
@ -2196,16 +2201,16 @@ File: xorrisofs.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top
* Jigdo Template Extraction, -jigdo-template-compress: Jigdo. (line 69)
* Jigdo Template Extraction, -md5-list: Jigdo. (line 67)
* Jigdo Template Extraction, _definition: Jigdo. (line 6)
* Joliet, allows longer names, -joliet-long: SetExtras. (line 119)
* Joliet, enable, -J, -joliet: SetExtras. (line 113)
* Joliet, allows longer names, -joliet-long: SetExtras. (line 124)
* Joliet, enable, -J, -joliet: SetExtras. (line 118)
* Joliet, _definition: Standards. (line 21)
* Links, follow on disk, -f, -follow-links: SetInsert. (line 22)
* Links, record and load hard links, --hardlinks: SetExtras. (line 97)
* Links, record and load hard links, --hardlinks: SetExtras. (line 102)
* MBR, GPT, append partition, -append_partition: SystemArea. (line 174)
* MBR, sectors per head, -partition_sec_hd: SystemArea. (line 146)
* MBR, sectors per head, -partition_sec_hd <1>: SystemArea. (line 149)
* MBR, _definition: SystemArea. (line 9)
* MD5, record and load, --md5: SetExtras. (line 89)
* MD5, record and load, --md5: SetExtras. (line 94)
* Message output, increase frequency, -gui: Miscellaneous. (line 29)
* Message output, redirect stderr, -log-file: Miscellaneous. (line 33)
* Message output, suppress, -quiet: Miscellaneous. (line 25)
@ -2229,9 +2234,9 @@ File: xorrisofs.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top
* Rock Ridge, (enabled by default), -R, -rock: SetExtras. (line 8)
* Rock Ridge, altered owner and permission, -r, -rational-rock: SetExtras.
(line 16)
* Rock Ridge, disable production, --norock: SetExtras. (line 24)
* Rock Ridge, disable production, --norock: SetExtras. (line 28)
* Rock Ridge, _definition: Standards. (line 14)
* scdbackup, record checksum tag, --scdbackup_tag: SetExtras. (line 105)
* scdbackup, record checksum tag, --scdbackup_tag: SetExtras. (line 110)
* Session, select path, -M, -prev-session, -dev: Loading. (line 11)
* Session, set load and write address, -C, -cdrecord-params: Loading.
(line 25)
@ -2240,11 +2245,11 @@ File: xorrisofs.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top
* System Id, set, -sysid: ImageId. (line 43)
* Table-of-content, emulation off, --no-emul-toc: SetProduct. (line 41)
* Table-of-content, emulation, --emul-toc: SetProduct. (line 33)
* UTF-16, for Joliet paths, -joliet-utf16: SetExtras. (line 125)
* UTF-16, for Joliet paths, -joliet-utf16: SetExtras. (line 130)
* Verbosity, high, -v, -verbose: Miscellaneous. (line 38)
* Volume Id, set, -V, -volid: ImageId. (line 13)
* Volume Set Id, set, -volset: ImageId. (line 25)
* xattr, record and load, --xattr: SetExtras. (line 82)
* xattr, record and load, --xattr: SetExtras. (line 87)
* xorriso, mkisofs emulation: Xorriso. (line 6)
* xorriso, options: Options. (line 6)
* zisofs file, enable recognition, -z, -transparent-compression: SetInsert.
@ -2264,26 +2269,26 @@ Node: SetInsert9753
Node: SetProduct14162
Node: SetCompl19338
Node: SetExtras21930
Node: SetHide31294
Node: ImageId32598
Node: Bootable36769
Node: SystemArea41937
Node: Charset57642
Node: Jigdo58667
Node: Miscellaneous62944
Node: Examples64589
Node: ExSimple65083
Node: ExGraft65566
Node: ExMkisofs66866
Node: ExGrowisofs68132
Node: ExIncBackup69322
Node: ExIncBckAcc72483
Node: ExBootable74172
Node: Files78354
Node: Seealso79449
Node: Bugreport80098
Node: Legal80689
Node: CommandIdx81586
Node: ConceptIdx96878
Node: SetHide31652
Node: ImageId32956
Node: Bootable37127
Node: SystemArea42295
Node: Charset58000
Node: Jigdo59025
Node: Miscellaneous63302
Node: Examples64947
Node: ExSimple65441
Node: ExGraft65924
Node: ExMkisofs67224
Node: ExGrowisofs68490
Node: ExIncBackup69680
Node: ExIncBckAcc72841
Node: ExBootable74530
Node: Files78712
Node: Seealso79807
Node: Bugreport80456
Node: Legal81047
Node: CommandIdx81944
Node: ConceptIdx97236

End Tag Table

13
xorriso/xorrisofs.texi
View File

@ -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.4.3, Jan 26, 2016"
@c man .TH XORRISOFS 1 "Version 1.4.3, Apr 27, 2016"
@c man .\" Please adjust this date whenever revising the manpage.
@c man .\"
@c man .\" Some roff macros, for reference:
@ -774,10 +774,15 @@ Alias of -R.
@kindex -r Rock Ridge with altered owner and permission
@cindex Rock Ridge, altered owner and permission, -r, -rational-rock
@*
Set Rock Ridge user and group id of all files in the ISO image to 0.
Enable Rock Ridge and set user and group id of all files in the ISO image to 0.
Grant r-permissions to all. Deny all w-permissions.
If any x-permission is set, grant x-permission to all.
Remove s-bit and t-bit.
@*
These attribute changes stay delayed until mkisofs emulation ends. Within the
same -as mkisofs emulation command they can be revoked by a subsequent
option @minus{}@minus{}norock. For compatibility reasons, option -R does not
revoke the changes ordered by -r.
@c man .TP
@item -rational-rock
@kindex -rational-rock Rock Ridge with altered owner and permission
@ -790,7 +795,9 @@ Alias of -r.
This option disables the production of Rock Ridge extensions for the
ISO 9660 file objects. The multi-session capabilities of @command{xorrisofs}
depend much on the naming fidelity of Rock Ridge. So it is strongly
discouraged to disable it by this option.
discouraged to disable it by this option, except for the special use case
to revoke the effect of -r by:
@minus{}@minus{}norock -R
@c man .TP
@item -file_name_limit number
@kindex -file_name_limit curbs length of file names