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

New -as mkisofs option --zisofs-susp-z2

Browse Source
This commit is contained in:
Thomas Schmitt 2020-10-29 09:34:02 +01:00
parent a9d8102996
commit 5316687d31
5 changed files with 63 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
xorriso/emulators.c
View File

@ -636,7 +636,7 @@ int Xorriso_genisofs_count_args(struct XorrisO *xorriso, int argc, char **argv,
"-isohybrid-gpt-basdat", "-isohybrid-gpt-hfsplus", "-isohybrid-gpt-basdat", "-isohybrid-gpt-hfsplus",
"-isohybrid-apm-hfsplus", "--grub2-boot-info", "-joliet-utf16", "-isohybrid-apm-hfsplus", "--grub2-boot-info", "-joliet-utf16",
"-appended_part_as_gpt", "-appended_part_as_apm", "--mbr-force-bootable", "-appended_part_as_gpt", "-appended_part_as_apm", "--mbr-force-bootable",
"-part_like_isohybrid", "--zisofs-version-2", "-part_like_isohybrid", "--zisofs-version-2", "--zisofs-susp-z2",
"" ""
}; };
static char arg1_options[][41]= { static char arg1_options[][41]= {
@ -949,6 +949,7 @@ int Xorriso_genisofs_help(struct XorrisO *xorriso, int flag)
" -z, -transparent-compression", " -z, -transparent-compression",
" Enable transparent compression of files", " Enable transparent compression of files",
" --zisofs-version-2 Enable processing of zisofs version 2 files", " --zisofs-version-2 Enable processing of zisofs version 2 files",
" --zisofs-susp-z2 Produce Z2 entries for version 2 instead of ZF",
" -root DIR Set root directory for all new files and directories", " -root DIR Set root directory for all new files and directories",
" -old-root DIR Set root directory in previous session that is searched for files", " -old-root DIR Set root directory in previous session that is searched for files",
" --old-root-no-md5 Do not record and use MD5 with -old-root", " --old-root-no-md5 Do not record and use MD5 with -old-root",
@ -1604,6 +1605,8 @@ int Xorriso_genisofs(struct XorrisO *xorriso, char *whom,
Xorriso_option_zisofs(xorriso, "by_magic=on", 0); Xorriso_option_zisofs(xorriso, "by_magic=on", 0);
} else if(strcmp(argpt, "--zisofs-version-2") == 0) { } else if(strcmp(argpt, "--zisofs-version-2") == 0) {
Xorriso_option_zisofs(xorriso, "by_magic=v2", 0); Xorriso_option_zisofs(xorriso, "by_magic=v2", 0);
} else if(strcmp(argpt, "--zisofs-susp-z2") == 0) {
Xorriso_option_zisofs(xorriso, "susp_z2=on", 0);
} else if(strcmp(argpt, "--stdio_sync")==0) { } else if(strcmp(argpt, "--stdio_sync")==0) {
if(i+1>=argc) if(i+1>=argc)
goto not_enough_args; goto not_enough_args;
@ -2037,7 +2040,8 @@ not_enough_args:;
} else if(strcmp(argpt, "-z")==0 || } else if(strcmp(argpt, "-z")==0 ||
strcmp(argpt, "-transparent-compression")==0 || strcmp(argpt, "-transparent-compression")==0 ||
strcmp(argpt, "--zisofs-version-2") == 0) { strcmp(argpt, "--zisofs-version-2") == 0 ||
strcmp(argpt, "--zisofs-susp-z2") == 0) {
/* was already handled in first argument scan */; /* was already handled in first argument scan */;
} else if(strcmp(argpt, "-U") == 0 || } else if(strcmp(argpt, "-U") == 0 ||
strcmp(argpt, "-untranslated-filenames") == 0) { strcmp(argpt, "-untranslated-filenames") == 0) {

2
xorriso/xorriso_timestamp.h
View File

@ -1 +1 @@
#define Xorriso_timestamP "2020.10.29.082836" #define Xorriso_timestamP "2020.10.29.083347"

7
xorriso/xorrisofs.1
View File

@ -9,7 +9,7 @@
.\" First parameter, NAME, should be all caps .\" First parameter, NAME, should be all caps
.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
.\" other parameters are allowed: see man(7), man(1) .\" other parameters are allowed: see man(7), man(1)
.TH XORRISOFS 1 "Version 1.5.3, Oct 13, 2020" .TH XORRISOFS 1 "Version 1.5.3, Oct 27, 2020"
.\" Please adjust this date whenever revising the manpage. .\" Please adjust this date whenever revising the manpage.
.\" .\"
.\" Some roff macros, for reference: .\" Some roff macros, for reference:
@ -280,6 +280,11 @@ header, block pointer list, and compressed data.
.br .br
\-\-zisofs\-version\-2 also enables \-z. \-\-zisofs\-version\-2 also enables \-z.
.TP .TP
\fB\--zisofs-susp-z2\fR
Enable the production of SUSP entries "Z2" instead of "ZF" with zisofs2
compressed files. Unaware Linux kernels are supposed to silently ignore "Z2"
entries.
.TP
\fB\-root\fR iso_rr_path \fB\-root\fR iso_rr_path
Insert all files under the given iso_rr_path. If option \-graft\-points is given, Insert all files under the given iso_rr_path. If option \-graft\-points is given,
then iso_rr_path is prepended to each target part of a pathspec. then iso_rr_path is prepended to each target part of a pathspec.

77
xorriso/xorrisofs.info
View File

@ -278,6 +278,10 @@ File: xorrisofs.info, Node: SetInsert, Next: SetProduct, Prev: Loading, Up:
The files will then appear as they were submitted to xorriso, i.e. The files will then appear as they were submitted to xorriso, i.e.
with zisofs2 header, block pointer list, and compressed data. with zisofs2 header, block pointer list, and compressed data.
-zisofs-version-2 also enables -z. -zisofs-version-2 also enables -z.
-zisofs-susp-z2
Enable the production of SUSP entries "Z2" instead of "ZF" with
zisofs2 compressed files. Unaware Linux kernels are supposed to
silently ignore "Z2" entries.
-root iso_rr_path -root iso_rr_path
Insert all files under the given iso_rr_path. If option Insert all files under the given iso_rr_path. If option
-graft-points is given, then iso_rr_path is prepended to each -graft-points is given, then iso_rr_path is prepended to each
@ -2003,10 +2007,10 @@ File: xorrisofs.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: T
* --old-empty old block addresses for empty files: SetProduct. * --old-empty old block addresses for empty files: SetProduct.
(line 105) (line 105)
* --old-root-devno enable disk idevno with -old-root: SetInsert. * --old-root-devno enable disk idevno with -old-root: SetInsert.
(line 93) (line 97)
* --old-root-no-ino disable disk ino with -old-root: SetInsert. * --old-root-no-ino disable disk ino with -old-root: SetInsert.
(line 82) (line 86)
* --old-root-no-md5 disable MD5 with -old-root: SetInsert. (line 100) * --old-root-no-md5 disable MD5 with -old-root: SetInsert. (line 104)
* --protective-msdos-label Patch System Area partition table: SystemArea. * --protective-msdos-label Patch System Area partition table: SystemArea.
(line 143) (line 143)
* --quoted_path_list read pathspecs from disk file: SetInsert. * --quoted_path_list read pathspecs from disk file: SetInsert.
@ -2022,6 +2026,8 @@ File: xorrisofs.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: T
(line 23) (line 23)
* --xattr Recording of any xattr: SetExtras. (line 116) * --xattr Recording of any xattr: SetExtras. (line 116)
* --xattr Recording of user xattr: SetExtras. (line 109) * --xattr Recording of user xattr: SetExtras. (line 109)
* --zisofs-susp-z2 produce Z2 for version 2 instead of ZF: SetInsert.
(line 64)
* --zisofs-version-2 enable recognition of zisofs2 files: SetInsert. * --zisofs-version-2 enable recognition of zisofs2 files: SetInsert.
(line 55) (line 55)
* -A set Application Id: ImageId. (line 34) * -A set Application Id: ImageId. (line 34)
@ -2155,7 +2161,7 @@ File: xorrisofs.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: T
* -no-pad do not add zeros to ISO tree: SetProduct. (line 101) * -no-pad do not add zeros to ISO tree: SetProduct. (line 101)
* -o set output file address: SetProduct. (line 8) * -o set output file address: SetProduct. (line 8)
* -old-exclude exclude disk files from inserting: SetInsert. (line 42) * -old-exclude exclude disk files from inserting: SetInsert. (line 42)
* -old-root enable incremental insertion: SetInsert. (line 69) * -old-root enable incremental insertion: SetInsert. (line 73)
* -omit-period omit trailing dot in ISO file names: SetCompl. (line 54) * -omit-period omit trailing dot in ISO file names: SetCompl. (line 54)
* -omit-version-number omit version number in ISO file names: SetCompl. * -omit-version-number omit version number in ISO file names: SetCompl.
(line 69) (line 69)
@ -2187,7 +2193,7 @@ File: xorrisofs.info, Node: CommandIdx, Next: ConceptIdx, Prev: Legal, Up: T
* -relaxed-filenames 7-bit special characters in ISO file names: SetCompl. * -relaxed-filenames 7-bit special characters in ISO file names: SetCompl.
(line 45) (line 45)
* -rock Rock Ridge (is enabled by default): SetExtras. (line 13) * -rock Rock Ridge (is enabled by default): SetExtras. (line 13)
* -root redirect ISO root directory: SetInsert. (line 64) * -root redirect ISO root directory: SetInsert. (line 68)
* -rr_reloc_dir set deep directory relocation target: SetExtras. * -rr_reloc_dir set deep directory relocation target: SetExtras.
(line 74) (line 74)
* -sparc-boot SUN SPARC boot images: SystemArea. (line 298) * -sparc-boot SUN SPARC boot images: SystemArea. (line 298)
@ -2335,12 +2341,12 @@ File: xorrisofs.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top
* Hiding, from Joliet, -hide-joliet-list: SetHide. (line 22) * Hiding, from Joliet, -hide-joliet-list: SetHide. (line 22)
* Image size, alignment, -partition_cyl_align: SystemArea. (line 186) * Image size, alignment, -partition_cyl_align: SystemArea. (line 186)
* Incremental insertion, disable disk ino, --old-root-no-ino: SetInsert. * Incremental insertion, disable disk ino, --old-root-no-ino: SetInsert.
(line 82) (line 86)
* Incremental insertion, disable MD5, --old-root-no-md5: SetInsert. * Incremental insertion, disable MD5, --old-root-no-md5: SetInsert.
(line 100) (line 104)
* Incremental insertion, enable disk devno, --old-root-devno: SetInsert. * Incremental insertion, enable disk devno, --old-root-devno: SetInsert.
(line 93) (line 97)
* Incremental insertion, enable, -old-root: SetInsert. (line 69) * Incremental insertion, enable, -old-root: SetInsert. (line 73)
* Interval reader for system area and partitions: SystemArea. (line 24) * Interval reader for system area and partitions: SystemArea. (line 24)
* ISO 9660, _definition: Standards. (line 6) * ISO 9660, _definition: Standards. (line 6)
* ISO 9660:1999, _definition: Standards. (line 26) * ISO 9660:1999, _definition: Standards. (line 26)
@ -2368,7 +2374,7 @@ File: xorrisofs.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top
(line 23) (line 23)
* ISO level, specify, -iso-level: SetCompl. (line 7) * ISO level, specify, -iso-level: SetCompl. (line 7)
* ISO level, specify, -iso-level <1>: SetCompl. (line 8) * ISO level, specify, -iso-level <1>: SetCompl. (line 8)
* ISO root directory, redirect, -root: SetInsert. (line 64) * ISO root directory, redirect, -root: SetInsert. (line 68)
* iso_rr_path, _definition: Insert. (line 8) * iso_rr_path, _definition: Insert. (line 8)
* Jigdo Template Extraction, -checksum-list: Jigdo. (line 77) * Jigdo Template Extraction, -checksum-list: Jigdo. (line 77)
* Jigdo Template Extraction, -checksum_algorithm_iso: Jigdo. (line 86) * Jigdo Template Extraction, -checksum_algorithm_iso: Jigdo. (line 86)
@ -2439,6 +2445,7 @@ File: xorrisofs.info, Node: ConceptIdx, Prev: CommandIdx, Up: Top
* xattr, record and load, --xattr-any: SetExtras. (line 116) * xattr, record and load, --xattr-any: SetExtras. (line 116)
* xorriso, mkisofs emulation: Xorriso. (line 6) * xorriso, mkisofs emulation: Xorriso. (line 6)
* xorriso, options: Options. (line 6) * xorriso, options: Options. (line 6)
* Z2 instead of ZF for version 2, -zisofs-susp-z2: SetInsert. (line 64)
* zisofs file, enable recognition, -z, -transparent-compression: SetInsert. * zisofs file, enable recognition, -z, -transparent-compression: SetInsert.
(line 47) (line 47)
* zisofs2 file, enable recognition, -zisofs-version-2: SetInsert. * zisofs2 file, enable recognition, -zisofs-version-2: SetInsert.
@ -2455,30 +2462,30 @@ Node: Xorriso5616
Node: Options6762 Node: Options6762
Node: Loading7489 Node: Loading7489
Node: SetInsert9530 Node: SetInsert9530
Node: SetProduct14380 Node: SetProduct14570
Node: SetCompl19951 Node: SetCompl20141
Node: SetExtras22543 Node: SetExtras22733
Node: SetHide34152 Node: SetHide34342
Node: ImageId35456 Node: ImageId35646
Node: Bootable39738 Node: Bootable39928
Node: SystemArea46024 Node: SystemArea46214
Node: Charset64373 Node: Charset64563
Node: Jigdo65398 Node: Jigdo65588
Node: Miscellaneous70368 Node: Miscellaneous70558
Node: Examples72013 Node: Examples72203
Node: ExSimple72507 Node: ExSimple72697
Node: ExGraft72990 Node: ExGraft73180
Node: ExMkisofs74290 Node: ExMkisofs74480
Node: ExGrowisofs76098 Node: ExGrowisofs76288
Node: ExIncBackup77288 Node: ExIncBackup77478
Node: ExIncBckAcc80464 Node: ExIncBckAcc80654
Node: ExBootable82169 Node: ExBootable82359
Node: Files86351 Node: Files86541
Node: Environ87446 Node: Environ87636
Node: Seealso88319 Node: Seealso88509
Node: Bugreport88970 Node: Bugreport89160
Node: Legal89563 Node: Legal89753
Node: CommandIdx90460 Node: CommandIdx90650
Node: ConceptIdx106954 Node: ConceptIdx107287
 
End Tag Table End Tag Table

9
xorriso/xorrisofs.texi
View File

@ -50,7 +50,7 @@
@c man .\" First parameter, NAME, should be all caps @c man .\" First parameter, NAME, should be all caps
@c man .\" Second parameter, SECTION, should be 1-8, maybe w/ subsection @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 .\" other parameters are allowed: see man(7), man(1)
@c man .TH XORRISOFS 1 "Version 1.5.3, Oct 13, 2020" @c man .TH XORRISOFS 1 "Version 1.5.3, Oct 27, 2020"
@c man .\" Please adjust this date whenever revising the manpage. @c man .\" Please adjust this date whenever revising the manpage.
@c man .\" @c man .\"
@c man .\" Some roff macros, for reference: @c man .\" Some roff macros, for reference:
@ -439,6 +439,13 @@ header, block pointer list, and compressed data.
@* @*
--zisofs-version-2 also enables -z. --zisofs-version-2 also enables -z.
@c man .TP @c man .TP
@item --zisofs-susp-z2
@kindex --zisofs-susp-z2 produce Z2 for version 2 instead of ZF
@cindex Z2 instead of ZF for version 2, --zisofs-susp-z2
Enable the production of SUSP entries "Z2" instead of "ZF" with zisofs2
compressed files. Unaware Linux kernels are supposed to silently ignore "Z2"
entries.
@c man .TP
@item -root iso_rr_path @item -root iso_rr_path
@kindex -root redirect ISO root directory @kindex -root redirect ISO root directory
@cindex ISO root directory, redirect, -root @cindex ISO root directory, redirect, -root