From d92a892ecebb7d5d362f252c487635c1fb9a4c6e Mon Sep 17 00:00:00 2001 From: cascading-pr Date: Mon, 20 Oct 2025 11:55:59 +0000 Subject: [PATCH] fix: enforce LXC bootstrap locks (#1098) cascading-pr from https://code.forgejo.org/forgejo/lxc-helpers/pulls/51 - bug fixes - [PR](https://code.forgejo.org/forgejo/runner/pulls/1098): fix: enforce LXC bootstrap locks Co-authored-by: cascading-pr Reviewed-on: https://code.forgejo.org/forgejo/runner/pulls/1098 Co-authored-by: cascading-pr Co-committed-by: cascading-pr --- act/runner/lxc-helpers-lib.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/act/runner/lxc-helpers-lib.sh b/act/runner/lxc-helpers-lib.sh index cd855a89..3f1d997a 100755 --- a/act/runner/lxc-helpers-lib.sh +++ b/act/runner/lxc-helpers-lib.sh @@ -74,8 +74,6 @@ function lxc_transaction_begin() { lxc_transaction_lock lxc_container_destroy $draft - - echo $draft } function lxc_transaction_commit() { @@ -391,7 +389,8 @@ function lxc_build_template_release() { return fi - local draft=$(lxc_transaction_begin $name) + lxc_transaction_begin $name + local draft=$(lxc_transaction_draft_name) $LXC_SUDO lxc-create --name $draft --template debian -- --release=$LXC_CONTAINER_RELEASE echo 'lxc.apparmor.profile = unconfined' | $LXC_SUDO tee -a $(lxc_config $draft) lxc_container_install_lxc_helpers $draft @@ -414,7 +413,8 @@ function lxc_build_template() { lxc_build_template_release fi - local draft=$(lxc_transaction_begin $newname) + lxc_transaction_begin $name + local draft=$(lxc_transaction_draft_name) if ! $LXC_SUDO lxc-copy --name=$name --newname=$draft; then echo lxc-copy --name=$name --newname=$draft failed return 1