diff --git a/sub_scripts/lxc_build.sh b/sub_scripts/lxc_build.sh index 7e336cd..0bea2c4 100755 --- a/sub_scripts/lxc_build.sh +++ b/sub_scripts/lxc_build.sh @@ -19,8 +19,16 @@ echo -e "\e[1m> Update et install lxc lxctl\e[0m" | tee "$LOG_BUILD_LXC" sudo apt-get update >> "$LOG_BUILD_LXC" 2>&1 sudo apt-get install -y lxc lxctl >> "$LOG_BUILD_LXC" 2>&1 -echo -e "\e[1m> Création d'une machine debian jessie minimaliste\e[0m" | tee -a "$LOG_BUILD_LXC" -sudo lxc-create -n $LXC_NAME -t debian -- -r jessie >> "$LOG_BUILD_LXC" 2>&1 +if sudo lxc-info -n $LXC_NAME > /dev/null 2>&1 +then # Si le conteneur existe déjà + echo -e "\e[1m> Suppression du conteneur existant.\e[0m" | tee -a "$LOG_BUILD_LXC" + sudo lxc-snapshot -n $LXC_NAME -d snap0 | tee -a "$LOG_BUILD_LXC" + sudo rm -f /var/lib/lxcsnaps/$LXC_NAME/snap0.tar.gz | tee -a "$LOG_BUILD_LXC" + sudo lxc-destroy -n $LXC_NAME -f | tee -a "$LOG_BUILD_LXC" +fi + +echo -e "\e[1m> Création d'une machine debian jessie minimaliste.\e[0m" | tee -a "$LOG_BUILD_LXC" +sudo lxc-create -n -t debian -- -r jessie >> "$LOG_BUILD_LXC" 2>&1 echo -e "\e[1m> Autoriser l'ip forwarding, pour router vers la machine virtuelle.\e[0m" | tee -a "$LOG_BUILD_LXC" echo "net.ipv4.ip_forward=1" | sudo tee /etc/sysctl.d/lxc_pchecker.conf >> "$LOG_BUILD_LXC" 2>&1 diff --git a/sub_scripts/lxc_remove.sh b/sub_scripts/lxc_remove.sh index 9e4902a..42abde5 100755 --- a/sub_scripts/lxc_remove.sh +++ b/sub_scripts/lxc_remove.sh @@ -14,24 +14,24 @@ fi touch "$script_dir/../pcheck.lock" # Met en place le lock de Package check -echo "\e[1m> Retire l'ip forwarding.\e[0m" +echo -e "\e[1m> Retire l'ip forwarding.\e[0m" sudo rm /etc/sysctl.d/lxc_pchecker.conf sudo sysctl -p -echo "\e[1m> Désactive le bridge réseau\e[0m" +echo -e "\e[1m> Désactive le bridge réseau\e[0m" sudo ifdown --force lxc-pchecker -echo "\e[1m> Supprime le brige réseau\e[0m" +echo -e "\e[1m> Supprime le brige réseau\e[0m" sudo rm /etc/network/interfaces.d/lxc-pchecker -echo "\e[1m> Suppression de la machine et de son snapshots\e[0m" +echo -e "\e[1m> Suppression de la machine et de son snapshots\e[0m" sudo lxc-snapshot -n $LXC_NAME -d snap0 sudo rm -f /var/lib/lxcsnaps/$LXC_NAME/snap0.tar.gz sudo lxc-destroy -n $LXC_NAME -f -echo "\e[1m> Remove lxc lxctl\e[0m" +echo -e "\e[1m> Remove lxc lxctl\e[0m" sudo apt-get remove lxc lxctl -echo "\e[1m> Suppression des lignes de pchecker_lxc dans .ssh/config\e[0m" +echo -e "\e[1m> Suppression des lignes de pchecker_lxc dans .ssh/config\e[0m" BEGIN_LINE=$(cat $HOME/.ssh/config | grep -n "^# ssh pchecker_lxc$" | cut -d':' -f 1) sed -i "$BEGIN_LINE,/^IdentityFile/d" $HOME/.ssh/config