diff --git a/sub_scripts/lxc_force_stop.sh b/sub_scripts/lxc_force_stop.sh index c3418bb..89ea77a 100755 --- a/sub_scripts/lxc_force_stop.sh +++ b/sub_scripts/lxc_force_stop.sh @@ -12,7 +12,10 @@ LXC_BRIDGE=$(cat "$pcheck_config" | grep LXC_BRIDGE= | cut -d '=' -f2) main_iface=$(cat "$pcheck_config" | grep iface= | cut -d '=' -f2) echo "> Arrêt du conteneur" -sudo lxc-stop -n $LXC_NAME +if [ $(sudo lxc-info --name $LXC_NAME | grep -c "STOPPED") -eq 0 ]; then + echo "Arrêt du conteneur $LXC_NAME" + sudo lxc-stop -n $LXC_NAME +fi echo "> Suppression des règles de parefeu" if sudo iptables -C FORWARD -i $LXC_BRIDGE -o $main_iface -j ACCEPT 2> /dev/null diff --git a/sub_scripts/testing_process.sh b/sub_scripts/testing_process.sh index 2899393..a07ecce 100644 --- a/sub_scripts/testing_process.sh +++ b/sub_scripts/testing_process.sh @@ -355,7 +355,7 @@ CHECK_SETUP () { fi # Copy original arguments - local manifest_args_mod=$manifest_arguments + local manifest_args_mod="$manifest_arguments" # Replace manifest key for the test replace_manifest_key "domain" "$sub_domain" @@ -431,7 +431,7 @@ CHECK_UPGRADE () { [ "$previous_install" = "1" ] && return # Copy original arguments - local manifest_args_mod=$manifest_arguments + local manifest_args_mod="$manifest_arguments" # Replace manifest key for the test replace_manifest_key "domain" "$sub_domain" @@ -513,7 +513,7 @@ CHECK_PUBLIC_PRIVATE () { [ "$previous_install" = "1" ] && return # Copy original arguments - local manifest_args_mod=$manifest_arguments + local manifest_args_mod="$manifest_arguments" # Replace manifest key for the test replace_manifest_key "domain" "$sub_domain" @@ -630,7 +630,7 @@ CHECK_MULTI_INSTANCE () { fi # Copy original arguments - local manifest_args_mod=$manifest_arguments + local manifest_args_mod="$manifest_arguments" # Replace manifest key for the test replace_manifest_key "domain" "$sub_domain" @@ -758,7 +758,7 @@ CHECK_COMMON_ERROR () { [ "$previous_install" = "1" ] && return # Copy original arguments - local manifest_args_mod=$manifest_arguments + local manifest_args_mod="$manifest_arguments" # Replace manifest key for the test replace_manifest_key "domain" "$sub_domain" @@ -843,7 +843,7 @@ CHECK_BACKUP_RESTORE () { [ "$previous_install" = "1" ] && return # Copy original arguments - local manifest_args_mod=$manifest_arguments + local manifest_args_mod="$manifest_arguments" # Replace manifest key for the test replace_manifest_key "domain" "$sub_domain"