From 60c89aa3043ed5eff01fc05eec3eb4c20fa0b935 Mon Sep 17 00:00:00 2001
From: Maniack Crudelis <maniack_crudelis@yahoo.fr>
Date: Sat, 4 Mar 2017 22:38:29 +0100
Subject: [PATCH] Fix main_iface

---
 sub_scripts/lxc_build.sh   | 2 +-
 sub_scripts/lxc_check.sh   | 1 +
 sub_scripts/lxc_upgrade.sh | 7 +++----
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/sub_scripts/lxc_build.sh b/sub_scripts/lxc_build.sh
index 3ccb433..2a47881 100755
--- a/sub_scripts/lxc_build.sh
+++ b/sub_scripts/lxc_build.sh
@@ -109,7 +109,7 @@ sudo iptables -t nat -A POSTROUTING -s $PLAGE_IP.0/24 -j MASQUERADE >> "$LOG_BUI
 echo -e "\e[1m> Vérification du contenu du resolv.conf\e[0m" | tee -a "$LOG_BUILD_LXC"
 if ! sudo cat /var/lib/lxc/$LXC_NAME/rootfs/etc/resolv.conf | grep -q nameserver; then
 	dnsforce=1	# Le resolv.conf est vide, on force l'ajout d'un dns.
-	sed -i "s/dnsforce=*/dnsforce=$dnsforce/" "$pcheck_config"
+	sed -i "s/dnsforce=.*/dnsforce=$dnsforce/" "$pcheck_config"
 fi
 if [ $dnsforce -eq 1 ]; then	# Force la réécriture du resolv.conf
 	echo "nameserver $dns" | sudo tee /var/lib/lxc/$LXC_NAME/rootfs/etc/resolv.conf
diff --git a/sub_scripts/lxc_check.sh b/sub_scripts/lxc_check.sh
index a4db9ca..5355a5f 100755
--- a/sub_scripts/lxc_check.sh
+++ b/sub_scripts/lxc_check.sh
@@ -17,6 +17,7 @@ then
 	YUNO_PWD=$(cat "$pcheck_config" | grep YUNO_PWD= | cut -d '=' -f2)
 	LXC_NAME=$(cat "$pcheck_config" | grep LXC_NAME= | cut -d '=' -f2)
 	LXC_BRIDGE=$(cat "$pcheck_config" | grep LXC_BRIDGE= | cut -d '=' -f2)
+	main_iface=$(cat "$pcheck_config" | grep iface= | cut -d '=' -f2)
 fi
 # Utilise des valeurs par défaut si les variables sont vides, et génère le fichier de config
 if [ -z "$PLAGE_IP" ]; then
diff --git a/sub_scripts/lxc_upgrade.sh b/sub_scripts/lxc_upgrade.sh
index cc05a9e..2b9c822 100755
--- a/sub_scripts/lxc_upgrade.sh
+++ b/sub_scripts/lxc_upgrade.sh
@@ -14,10 +14,9 @@ pcheck_config="$script_dir/../config"
 PLAGE_IP=$(cat "$pcheck_config" | grep PLAGE_IP= | cut -d '=' -f2)
 LXC_NAME=$(cat "$pcheck_config" | grep LXC_NAME= | cut -d '=' -f2)
 LXC_BRIDGE=$(cat "$pcheck_config" | grep LXC_BRIDGE= | cut -d '=' -f2)
+main_iface=$(cat "$pcheck_config" | grep iface= | cut -d '=' -f2)
 
-if [ -e "$script_dir/../config" ]; then
-	main_iface=$(cat "$script_dir/../config" | grep iface= | cut -d '=' -f2)
-else	# Si le fichier de config n'existe pas
+if [ -z "$main_iface" ]; then
 	# Tente de définir l'interface réseau principale
 	main_iface=$(sudo route | grep default | awk '{print $8;}')	# Prend l'interface réseau défini par default
 	if [ -z $main_iface ]; then
@@ -25,7 +24,7 @@ else	# Si le fichier de config n'existe pas
 		exit 1
 	fi
 	# Enregistre le nom de l'interface réseau de l'hôte dans un fichier de config
-	echo -e "# interface réseau principale de l'hôte\niface=$main_iface\n" > "$script_dir/../config"
+	echo -e "# Interface réseau principale de l'hôte\niface=$main_iface\n" >> "$pcheck_config"
 fi
 
 # Check user