From ecc55faf3b79c9050a52b8276c2247c3de4270bd Mon Sep 17 00:00:00 2001 From: Akos Eros Date: Wed, 24 Sep 2025 13:34:32 +0200 Subject: [PATCH 1/2] fix: Drop the quiet from the podman system connection list cmd The quiet option only available from podman 4.3. Instead just drop the header line and count the connections manually. This way we would still be able to see any other errors. resolves #637 --- scripts/pattern-util.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/pattern-util.sh b/scripts/pattern-util.sh index ff6b2bbb6..77e0ed389 100755 --- a/scripts/pattern-util.sh +++ b/scripts/pattern-util.sh @@ -62,7 +62,7 @@ fi # Detect if we use podman machine. If we do not then we bind mount local host ssl folders # if we are using podman machine then we do not bind mount anything (for now!) -REMOTE_PODMAN=$(podman system connection list -q | wc -l) +REMOTE_PODMAN=$(podman system connection list | tail -n +2 | wc -l) if [ $REMOTE_PODMAN -eq 0 ]; then # If we are not using podman machine we check the hosts folders # We check /etc/pki/tls because on ubuntu /etc/pki/fwupd sometimes # exists but not /etc/pki/tls and we do not want to bind mount in such a case From 9425d1f2ebd3ae2f37b566c21d3878f8ac4e91f1 Mon Sep 17 00:00:00 2001 From: Akos Eros Date: Fri, 26 Sep 2025 09:05:11 +0200 Subject: [PATCH 2/2] fix: escape the script path variable This is needed for environments that allow spaces in folder names. resolves #638 --- scripts/process-secrets.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scripts/process-secrets.sh b/scripts/process-secrets.sh index a0d34f880..10288d1f7 100755 --- a/scripts/process-secrets.sh +++ b/scripts/process-secrets.sh @@ -12,7 +12,7 @@ COMMONPATH=$(dirname "${SCRIPTPATH}") PATTERNPATH=$(dirname "${COMMONPATH}") PATTERN_NAME=${1:-$(basename "`pwd`")} -SECRETS_BACKING_STORE="$($SCRIPTPATH/determine-secretstore-backend.sh)" +SECRETS_BACKING_STORE="$("$SCRIPTPATH/determine-secretstore-backend.sh")" EXTRA_PLAYBOOK_OPTS="${EXTRA_PLAYBOOK_OPTS:-}"