Skip to content

Commit

Permalink
build-x86-images: Fix passing of additional arguments to mklive
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
0x5c authored and the-maldridge committed Feb 20, 2023
1 parent c9dbeed commit c0d8ff0
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion build-x86-images.sh.in
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -81,5 +82,5 @@ if [ ! -x mklive.sh ]; then
fi

for image in $IMAGES; do
build_variant "$image"
build_variant "$image" "$@"
done

0 comments on commit c0d8ff0

Please sign in to comment.