Send patches - preferably formatted by git format-patch - to patches at archlinux32 dot org.
summaryrefslogtreecommitdiff
path: root/archiso
diff options
context:
space:
mode:
authornl6720 <nl6720@gmail.com>2021-09-16 10:40:21 +0300
committernl6720 <nl6720@gmail.com>2021-11-05 12:43:48 +0200
commitad6d65ab875c9a1ea6edea9e6b1ba99be4932cae (patch)
tree2fd8b78bfb7ca09e780636bd7f95348828766e0b /archiso
parentd2addb25c94e10341362e38af89ca3afd6144409 (diff)
mkarchiso: silence xorriso's note about SOURCE_DATE_EPOCH
The `xorriso -as mkisofs` option `-quiet` is interpreted too late. Use native xorriso option `-report_about SORRY` instead and ensure it is the first option. Related to #148.
Diffstat (limited to 'archiso')
-rwxr-xr-xarchiso/mkarchiso11
1 files changed, 8 insertions, 3 deletions
diff --git a/archiso/mkarchiso b/archiso/mkarchiso
index bb0549a..eb30e04 100755
--- a/archiso/mkarchiso
+++ b/archiso/mkarchiso
@@ -995,12 +995,17 @@ _build_bootstrap_image() {
# Build ISO
_build_iso_image() {
- local xorrisofs_options=()
+ local xorriso_options=() xorrisofs_options=()
local bootmode
[[ -d "${out_dir}" ]] || install -d -- "${out_dir}"
- [[ "${quiet}" == "y" ]] && xorrisofs_options+=('-quiet')
+ if [[ "${quiet}" == "y" ]]; then
+ # The when xorriso is run in mkisofs compatibility mode (xorrisofs), the mkisofs option -quiet is interpreted
+ # too late (e.g. messages about SOURCE_DATE_EPOCH still get shown).
+ # Instead use native xorriso option to silence the output.
+ xorriso_options=('-report_about' 'SORRY' "${xorriso_options[@]}")
+ fi
# Add required xorrisofs options for each boot mode
for bootmode in "${bootmodes[@]}"; do
@@ -1009,7 +1014,7 @@ _build_iso_image() {
rm -f -- "${out_dir}/${image_name}"
_msg_info "Creating ISO image..."
- xorriso -as mkisofs \
+ xorriso "${xorriso_options[@]}" -as mkisofs \
-iso-level 3 \
-full-iso9660-filenames \
-joliet \