From bf79d7be9ec51c061b5fcca3b36a7da3423fc154 Mon Sep 17 00:00:00 2001 From: nl6720 Date: Wed, 1 Dec 2021 18:08:26 +0200 Subject: mkarchiso: prevent interference from xorriso startup files Options set in xorriso startup files (~/.xorrisorc) could interfere with the xorriso command run by mkarchiso. For example, if ~root/.xorrisorc contains -dummy on, then the ISO file will be empty. Pass -no_rc as the first option to xorriso to prevent interference and unintended behavior. Fixes #153. --- CHANGELOG.rst | 1 + archiso/mkarchiso | 7 ++++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.rst b/CHANGELOG.rst index 31e48df..cab4633 100644 --- a/CHANGELOG.rst +++ b/CHANGELOG.rst @@ -18,6 +18,7 @@ Fixed ----- - Sign the root file system image only once. +- Make sure xorriso does not read its configuration files to prevent interference and unintended behavior. Removed ------- diff --git a/archiso/mkarchiso b/archiso/mkarchiso index 3961f15..470a960 100755 --- a/archiso/mkarchiso +++ b/archiso/mkarchiso @@ -1501,11 +1501,16 @@ _build_iso_image() { [[ -d "${out_dir}" ]] || install -d -- "${out_dir}" + # Do not read xorriso startup files to prevent interference and unintended behavior. + # For it to work, -no_rc must be the first argument passed to xorriso. + xorriso_options=('-no_rc') + + 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[@]}") + xorriso_options+=('-report_about' 'SORRY') fi # Add required xorrisofs options for each boot mode -- cgit v1.2.3-70-g09d2