From c0d8ff0f4db5d8fbaa61695069a2456f3b33dca9 Mon Sep 17 00:00:00 2001 From: 0x5c Date: Sun, 19 Feb 2023 18:35:23 -0500 Subject: [PATCH] build-x86-images: Fix passing of additional arguments to mklive Mklive is called with "$@", to be able to pass additionnal arguments to it. However, since mklive is called from within a function, the value of "$@" is the function's argument. This is fixed by adding "$@" to the function call and using shift after its first argument (the image flavour) is used. --- build-x86-images.sh.in | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/build-x86-images.sh.in b/build-x86-images.sh.in index 332dcb1bfd..9054c34d86 100644 --- a/build-x86-images.sh.in +++ b/build-x86-images.sh.in @@ -24,6 +24,7 @@ shift $((OPTIND - 1)) build_variant() { variant="$1" + shift IMG=void-live-${ARCH}-${DATE}-${variant}.iso GRUB_PKGS="grub-i386-efi grub-x86_64-efi" PKGS="dialog cryptsetup lvm2 mdadm void-docs-browse xtools-minimal $GRUB_PKGS" @@ -81,5 +82,5 @@ if [ ! -x mklive.sh ]; then fi for image in $IMAGES; do - build_variant "$image" + build_variant "$image" "$@" done