From e24232f146621708aedf531a0f3bbe4be59f2bf9 Mon Sep 17 00:00:00 2001 From: Jeremi Piotrowski Date: Wed, 10 Apr 2024 08:01:58 +0000 Subject: [PATCH 1/2] bake_flatcar_image: Fix check for empty sysext list "${sysexts[@]}" expands every argument separately, while we need all array members to be expanded into a single string for the test to work. "${sysexts[*]}" is what we want. Signed-off-by: Jeremi Piotrowski --- bake_flatcar_image.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bake_flatcar_image.sh b/bake_flatcar_image.sh index b081525..b4d3889 100755 --- a/bake_flatcar_image.sh +++ b/bake_flatcar_image.sh @@ -273,7 +273,7 @@ while [ $# -gt 0 ]; do esac done -if [ -z "${sysexts[@]}" ] ; then +if [ -z "${sysexts[*]}" ] ; then echo -e "\nERROR: No sysexts specified.\n" print_help exit 1 From bbe3436e2f57e61bd55e41b720f06bc5eb6d1417 Mon Sep 17 00:00:00 2001 From: Jeremi Piotrowski Date: Wed, 10 Apr 2024 09:47:54 +0000 Subject: [PATCH 2/2] bake_flatcar_image: Pass all sysexts to install_sysexts $sysexts is an array, so we need to specify the @ index to have all entries passed to the function invocation. The current version passes only the first entry. Signed-off-by: Jeremi Piotrowski --- bake_flatcar_image.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/bake_flatcar_image.sh b/bake_flatcar_image.sh index b4d3889..0f88130 100755 --- a/bake_flatcar_image.sh +++ b/bake_flatcar_image.sh @@ -322,7 +322,7 @@ mkdir "${workdir}" cd "${workdir}" download_all "$board" "${vendor}" "$release" - install_sysexts "${install_to}" "${sysexts}" + install_sysexts "${install_to}" "${sysexts[@]}" create_vendor_image "$board" "${vendor}" rm -f *.sig *.squashfs )