From efc71e6d8629f0e3b5bd2541650266d632a2fe68 Mon Sep 17 00:00:00 2001 From: Neal Gompa Date: Wed, 19 Mar 2025 10:48:55 -0400 Subject: kiwi-build: Pass on arguments after "--" to kiwi This simplifies supporting one-off custom actions without having to define options in the helper script all the time. --- kiwi-build | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/kiwi-build b/kiwi-build index 04d1ca9..509020a 100755 --- a/kiwi-build +++ b/kiwi-build @@ -46,6 +46,9 @@ while true; do esac done +# Capture arguments after -- +kiwibuild_extra_args=("$@") + if [ -z "$output_dir" ] || [ -z "$image_type" ] || [ -z "$image_profile" ] || [ -z "$kiwi_file" ]; then echo "Options not set!" usage @@ -56,7 +59,8 @@ kiwi_bundle_format=$("${kiwibuild_scriptdir}/scripts/fedora-kiwi-bundle-format-g if [ "$image_type" = "iso" ]; then # Add parameters for embedded ISO IDs - kiwibuild_extra_args=$("${kiwibuild_scriptdir}/scripts/fedora-live-iso-label-generator" "${kiwi_file}" "${image_profile}" --output-kiwi-args) + kiwibuild_iso_extra_args=$("${kiwibuild_scriptdir}/scripts/fedora-live-iso-label-generator" "${kiwi_file}" "${image_profile}" --output-kiwi-args) + kiwibuild_extra_args="${kiwibuild_extra_args:+${kiwibuild_extra_args}} ${kiwibuild_iso_extra_args}" fi if [ "$image_type" = "oci" ]; then -- cgit v1.3.1+13