From 2670d2d4fb47d5e58dc20ae284b6edcb9dd571e8 Mon Sep 17 00:00:00 2001 From: Maniack Crudelis Date: Fri, 2 Dec 2016 23:15:51 +0100 Subject: [PATCH] lock setup et remove --- sub_scripts/auto_upgrade.sh | 2 +- sub_scripts/lxc_build.sh | 4 ++++ sub_scripts/lxc_remove.sh | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/sub_scripts/auto_upgrade.sh b/sub_scripts/auto_upgrade.sh index c93d45a..56237a2 100755 --- a/sub_scripts/auto_upgrade.sh +++ b/sub_scripts/auto_upgrade.sh @@ -8,7 +8,7 @@ if [ "${0:0:1}" == "/" ]; then script_dir="$(dirname "$0")"; else script_dir="$( echo "" date # Vérifie que Package check n'est pas déjà utilisé. -timeout=7300 # Durée d'attente maximale +timeout=7200 # Durée d'attente maximale inittime=$(date +%s) # Enregistre l'heure de début d'attente while test -e "$script_dir/../pcheck.lock"; do # Vérifie la présence du lock de Package check sleep 60 # Attend la fin de l'exécution de Package check. diff --git a/sub_scripts/lxc_build.sh b/sub_scripts/lxc_build.sh index 80ee613..49c97cf 100755 --- a/sub_scripts/lxc_build.sh +++ b/sub_scripts/lxc_build.sh @@ -10,6 +10,8 @@ DOMAIN=domain.tld YUNO_PWD=admin LXC_NAME=pchecker_lxc +touch "$script_dir/../pcheck.lock" # Met en place le lock de Package check, le temps de l'installation + # Check user echo $(whoami) > "$script_dir/setup_user" @@ -128,3 +130,5 @@ sudo ifdown --force lxc-pchecker >> "$LOG_BUILD_LXC" 2>&1 echo "> Création d'un snapshot" | tee -a "$LOG_BUILD_LXC" sudo lxc-snapshot -n $LXC_NAME >> "$LOG_BUILD_LXC" 2>&1 # Il sera nommé snap0 et stocké dans /var/lib/lxcsnaps/$LXC_NAME/snap0/ + +sudo rm "$script_dir/../pcheck.lock" # Retire le lock diff --git a/sub_scripts/lxc_remove.sh b/sub_scripts/lxc_remove.sh index 0ba17f6..4eb4c49 100755 --- a/sub_scripts/lxc_remove.sh +++ b/sub_scripts/lxc_remove.sh @@ -12,7 +12,7 @@ if [ "$(whoami)" != "$(cat "$script_dir/setup_user")" ] && test -e "$script_dir/ exit 0 fi -sudo rm "$script_dir/../pcheck.lock" # Retire le lock +touch "$script_dir/../pcheck.lock" # Met en place le lock de Package check echo "> Retire l'ip forwarding." sudo rm /etc/sysctl.d/lxc_pchecker.conf