From 2ae3626050919b444ac7e3cea9d358d67619cecf Mon Sep 17 00:00:00 2001 From: Alexandre Aubin Date: Wed, 8 Feb 2023 20:51:52 +0100 Subject: [PATCH] Try to fix the witness shit blocking everything for some reason --- lib/lxc.sh | 4 ++-- lib/witness.sh | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/lxc.sh b/lib/lxc.sh index 74a0fdc..ff16929 100644 --- a/lib/lxc.sh +++ b/lib/lxc.sh @@ -36,7 +36,7 @@ LXC_CREATE () { [[ "$pipestatus" -eq 0 ]] || exit 1 _LXC_START_AND_WAIT $LXC_NAME - sleep 3 + sleep 10 set_witness_files sleep 3 log_info "Creating initial snapshot $LXC_NAME ..." @@ -252,5 +252,5 @@ CLEAN_SWAPFILES() { } RUN_INSIDE_LXC() { - timeout --signal TERM 300 lxc exec $LXC_NAME -- "$@" + lxc exec $LXC_NAME -- "$@" } diff --git a/lib/witness.sh b/lib/witness.sh index ea31590..78b3e30 100644 --- a/lib/witness.sh +++ b/lib/witness.sh @@ -5,7 +5,7 @@ set_witness_files () { create_witness_file () { [ "$2" = "file" ] && local action="touch" || local action="mkdir -p" - RUN_INSIDE_LXC $action $1 + RUN_INSIDE_LXC timeout --signal TERM 10 $action $1 } # Nginx conf