From ad1b9bfe035a3ea4785727f5ab5207736d79ddd4 Mon Sep 17 00:00:00 2001 From: Thomas Schmitt Date: Fri, 14 Apr 2023 18:20:33 +0200 Subject: [PATCH] Added -joliet "on" to xorriso run in merge_debian_isos --- test/merge_debian_isos | 7 ++++--- test/merge_debian_isos.1 | 10 ++++++++++ test/merge_debian_isos.info | 35 ++++++++++++++++++++++++----------- test/merge_debian_isos.sig | Bin 72 -> 72 bytes test/merge_debian_isos.texi | 12 ++++++++++++ xorriso/xorriso_timestamp.h | 2 +- 6 files changed, 51 insertions(+), 15 deletions(-) diff --git a/test/merge_debian_isos b/test/merge_debian_isos index 3b752f2b..e02aa53b 100755 --- a/test/merge_debian_isos +++ b/test/merge_debian_isos @@ -1,5 +1,5 @@ #!/bin/sh -# Copyright 2022 Thomas Schmitt , libburnia project. +# Copyright 2022-2023 Thomas Schmitt , libburnia project. # Provided under BSD license: Use, modify, and distribute as you like. # This obtrusive setting shall make the script safe against exotic locales. @@ -13,12 +13,12 @@ usage() { echo "mount_template1 to mount_templateN, if not already mounted that way." >&2 echo "Then the Debian pools and package lists get merged and a new" >&2 echo "ISO 9660 image result_iso is produced. If iso1 is bootable then" >&2 - echo "then the new image will be bootable by the same means." >&2 + echo "the new image will be bootable by the same means." >&2 echo >&2 echo "The file depicted by result_iso must not yet exist or has to be a" >&2 echo "device which is acceptable for Linux-specific helper script" >&2 echo "xorriso-dd-target. If xorriso-dd-target agrees and the user" >&2 - echo 'confirms by input "yes" then xoriso will be run under sudo.' >&2 + echo 'confirms by input "yes" then xorriso will be run under sudo.' >&2 echo 'Exempted from this evaluation are addresses which begin by "mmc:"' >&2 echo 'for an optical drive on Linux, BSDs, Solaris, or by "stdio:/dev/"' >&2 echo 'for which the user takes full and dangerous responsibility.' >&2 @@ -1116,6 +1116,7 @@ if $XORRISO_SUDO "$XORRISO" \ -stdio_sync "$XORRISO_STDIO_SYNC" \ -padding included \ -stream_recording on \ + -joliet on \ -compliance no_emul_toc then # Revoke mark for possible removal by cleanup diff --git a/test/merge_debian_isos.1 b/test/merge_debian_isos.1 index c29102cd..ca6761b0 100644 --- a/test/merge_debian_isos.1 +++ b/test/merge_debian_isos.1 @@ -122,6 +122,16 @@ Directory ./merge_mount/ will be created if not yet existing. merge_debian_isos merged.iso merge_mount/iso \\ debian\-11.2.0\-amd64\-DVD\-[12345].iso +.br +Expect to see some harmless warnings like +.br + +xorriso : WARNING : \-volid text does not comply to ISO 9660 / ECMA 119 rules + +libisofs: WARNING : Cannot add /debian to Joliet tree. Symlinks can only be added to a Rock Ridge tree. + +libisofs: WARNING : Image size exceeds 1024 cylinders. Cannot align partition. + .SS .B Use GNU xorriso instead of installed xorriso merge_debian_isos will refuse to work if the installed version of xorriso diff --git a/test/merge_debian_isos.info b/test/merge_debian_isos.info index c4361ca0..0fc09198 100644 --- a/test/merge_debian_isos.info +++ b/test/merge_debian_isos.info @@ -115,6 +115,19 @@ Directory ./merge_mount/ will be created if not yet existing. merge_debian_isos merged.iso merge_mount/iso \ debian-11.2.0-amd64-DVD-[12345].iso + + + Expect to see some harmless warnings like + + xorriso : WARNING : -volid text does not comply to ISO 9660 / ECMA +119 rules + + libisofs: WARNING : Cannot add /debian to Joliet tree. Symlinks can +only be added to a Rock Ridge tree. + + libisofs: WARNING : Image size exceeds 1024 cylinders. Cannot align +partition. +  File: merge_debian_isos.info, Node: ExXorriso, Next: ExOptical, Prev: ExPlain, Up: Examples @@ -331,16 +344,16 @@ Node: Overview1014 Node: Options3381 Node: Examples3771 Node: ExPlain4196 -Node: ExXorriso4548 -Node: ExOptical5342 -Node: ExDdTarget6126 -Node: ExStdio7649 -Node: Files8561 -Node: Environ8717 -Node: Seealso9782 -Node: Bugreport9931 -Node: Legal10516 -Node: CommandIdx11344 -Node: ConceptIdx11491 +Node: ExXorriso4870 +Node: ExOptical5664 +Node: ExDdTarget6448 +Node: ExStdio7971 +Node: Files8883 +Node: Environ9039 +Node: Seealso10104 +Node: Bugreport10253 +Node: Legal10838 +Node: CommandIdx11666 +Node: ConceptIdx11813  End Tag Table diff --git a/test/merge_debian_isos.sig b/test/merge_debian_isos.sig index 7f7bfa29a44385934777847d516c2d68701d6e30..dcad21519edd23abacf40b2fb6a0d1123d8bdd82 100644 GIT binary patch literal 72 zcmV-O0Jr~$Mg#y60ssaD0%SRS8~_Rl5b4X`z^lNhR4*|ApuDmq0km=fn+L5lU(sMs eo>-dHJOG|3XMpIm<>bT>WKzz6sly=JRLZ1)F&)$Z literal 72 zcmV-O0Jr~$Mg#y60ssaD0%F#;LI4U05b4X`z^lNhR0YWZpr-_Bx)nmV?ev0x!p0Ob eeGoi!`v9PeYb?S76n%c`s}hW?;N5A6F0KjPP98e| diff --git a/test/merge_debian_isos.texi b/test/merge_debian_isos.texi index a32f21ff..0f71f040 100644 --- a/test/merge_debian_isos.texi +++ b/test/merge_debian_isos.texi @@ -220,6 +220,18 @@ Directory ./merge_mount/ will be created if not yet existing. merge_debian_isos merged.iso merge_mount/iso \ debian-11.2.0-amd64-DVD-[12345].iso +@* +@sp 1 +Expect to see some harmless warnings like +@* +@sp 1 + +xorriso : WARNING : -volid text does not comply to ISO 9660 / ECMA 119 rules + +libisofs: WARNING : Cannot add /debian to Joliet tree. Symlinks can only be added to a Rock Ridge tree. + +libisofs: WARNING : Image size exceeds 1024 cylinders. Cannot align partition. + @c man .SS @c man .B Use GNU xorriso instead of installed xorriso @node ExXorriso, ExOptical, ExPlain, Examples diff --git a/xorriso/xorriso_timestamp.h b/xorriso/xorriso_timestamp.h index 0e44a2e0..7b822c21 100644 --- a/xorriso/xorriso_timestamp.h +++ b/xorriso/xorriso_timestamp.h @@ -1 +1 @@ -#define Xorriso_timestamP "2023.03.19.153432" +#define Xorriso_timestamP "2023.04.14.161945"