From f16dce149c4d735e4d1bb3adb309aa2718acbbe7 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sat, 2 Mar 2019 16:29:01 +0100 Subject: [PATCH 1/9] Fix lcx creation for aarch64 --- sub_scripts/lxc_build.sh | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/sub_scripts/lxc_build.sh b/sub_scripts/lxc_build.sh index ac34707..1ac40d9 100755 --- a/sub_scripts/lxc_build.sh +++ b/sub_scripts/lxc_build.sh @@ -88,7 +88,13 @@ then # Si le conteneur existe déjà fi echo -e "\e[1m> Création d'une machine debian $DISTRIB minimaliste.\e[0m" | tee -a "$LOG_BUILD_LXC" -sudo lxc-create -n $LXC_NAME -t debian -- -r $DISTRIB >> "$LOG_BUILD_LXC" 2>&1 +uname=$(uname -m) +if [[ $uname =~ aarch64 ]] +then + sudo lxc-create -n $LXC_NAME -t debian -- -r $DISTRIB --arch=arm64 >> "$LOG_BUILD_LXC" 2>&1 +else + sudo lxc-create -n $LXC_NAME -t debian -- -r $DISTRIB >> "$LOG_BUILD_LXC" 2>&1 +fi 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 From f2591457e1aab0c9ca89f4c99a15938f58461e77 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sat, 2 Mar 2019 23:43:33 +0100 Subject: [PATCH 2/9] let time for lxc container to start --- sub_scripts/lxc_check.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sub_scripts/lxc_check.sh b/sub_scripts/lxc_check.sh index 7714a26..498de53 100755 --- a/sub_scripts/lxc_check.sh +++ b/sub_scripts/lxc_check.sh @@ -406,7 +406,7 @@ lxc_net_check=0 # Passe sur les différents tests while test "$lxc_net" -eq 1 # Boucle tant que la connexion internet du conteneur n'est pas réparée. do REBOOT_CONTENEUR - sleep 3 + sleep 30 sudo lxc-ls -f CHECK_LXC_NET lxc_net=$? From 7f76730a94594ede35bb716a3828765f8d5d322e Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sun, 3 Mar 2019 00:05:10 +0100 Subject: [PATCH 3/9] add time for lxc to start --- sub_scripts/launcher.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sub_scripts/launcher.sh b/sub_scripts/launcher.sh index d8f922a..4b9e150 100755 --- a/sub_scripts/launcher.sh +++ b/sub_scripts/launcher.sh @@ -179,7 +179,7 @@ LXC_START () { sleep 1 done echo "" - + sleep 30 local failstart=0 # Check if the container is running if ! is_lxc_running; then From ec73e7689331fbc85522ad95c7f3c239289d75a8 Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sun, 3 Mar 2019 00:25:37 +0100 Subject: [PATCH 4/9] add time for lxc to start --- sub_scripts/launcher.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sub_scripts/launcher.sh b/sub_scripts/launcher.sh index 4b9e150..1953a66 100755 --- a/sub_scripts/launcher.sh +++ b/sub_scripts/launcher.sh @@ -179,7 +179,7 @@ LXC_START () { sleep 1 done echo "" - sleep 30 + sleep 60 local failstart=0 # Check if the container is running if ! is_lxc_running; then From 732fb597e753705a16ee62758c126b1e79ef995b Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sun, 3 Mar 2019 00:34:06 +0100 Subject: [PATCH 5/9] reduce time needed for lxc to start --- sub_scripts/launcher.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sub_scripts/launcher.sh b/sub_scripts/launcher.sh index 1953a66..4b9e150 100755 --- a/sub_scripts/launcher.sh +++ b/sub_scripts/launcher.sh @@ -179,7 +179,7 @@ LXC_START () { sleep 1 done echo "" - sleep 60 + sleep 30 local failstart=0 # Check if the container is running if ! is_lxc_running; then From 60ff7bb4a1369d29f36aaa2e98872f8c4780f52c Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sun, 3 Mar 2019 23:38:49 +0100 Subject: [PATCH 6/9] aarch64 simplication --- sub_scripts/lxc_build.sh | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/sub_scripts/lxc_build.sh b/sub_scripts/lxc_build.sh index 1ac40d9..38d392c 100755 --- a/sub_scripts/lxc_build.sh +++ b/sub_scripts/lxc_build.sh @@ -88,13 +88,13 @@ then # Si le conteneur existe déjà fi echo -e "\e[1m> Création d'une machine debian $DISTRIB minimaliste.\e[0m" | tee -a "$LOG_BUILD_LXC" -uname=$(uname -m) -if [[ $uname =~ aarch64 ]] +if [ "$(uname -m)" == "aarch64" ] then - sudo lxc-create -n $LXC_NAME -t debian -- -r $DISTRIB --arch=arm64 >> "$LOG_BUILD_LXC" 2>&1 + arch_arg="--arch=arm64" else - sudo lxc-create -n $LXC_NAME -t debian -- -r $DISTRIB >> "$LOG_BUILD_LXC" 2>&1 + arch_arg="" fi +sudo lxc-create -n $LXC_NAME -t debian -- -r $DISTRIB $arch_arg >> "$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 From 9de3f37d67fed1961cfa3a60be9f144b00dc475d Mon Sep 17 00:00:00 2001 From: yalh76 Date: Sun, 3 Mar 2019 23:47:47 +0100 Subject: [PATCH 7/9] limit sleep to aachr64 --- sub_scripts/launcher.sh | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sub_scripts/launcher.sh b/sub_scripts/launcher.sh index 4b9e150..c99e62e 100755 --- a/sub_scripts/launcher.sh +++ b/sub_scripts/launcher.sh @@ -179,7 +179,11 @@ LXC_START () { sleep 1 done echo "" - sleep 30 + if [ "$(uname -m)" == "aarch64" ] + then + sleep 30 + fi + local failstart=0 # Check if the container is running if ! is_lxc_running; then From 7739ea3919ac5c4c4b60064545dccbd4672e48bc Mon Sep 17 00:00:00 2001 From: yalh76 Date: Mon, 4 Mar 2019 01:46:21 +0100 Subject: [PATCH 8/9] spacing --- sub_scripts/launcher.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sub_scripts/launcher.sh b/sub_scripts/launcher.sh index c99e62e..eebcca1 100755 --- a/sub_scripts/launcher.sh +++ b/sub_scripts/launcher.sh @@ -181,7 +181,7 @@ LXC_START () { echo "" if [ "$(uname -m)" == "aarch64" ] then - sleep 30 + sleep 30 fi local failstart=0 From ca814e8e767cbd9da5f88bf5a849daf3d23c2630 Mon Sep 17 00:00:00 2001 From: Maniack Crudelis Date: Mon, 4 Mar 2019 15:06:55 +0100 Subject: [PATCH 9/9] Update lxc_check.sh --- sub_scripts/lxc_check.sh | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/sub_scripts/lxc_check.sh b/sub_scripts/lxc_check.sh index 498de53..b365992 100755 --- a/sub_scripts/lxc_check.sh +++ b/sub_scripts/lxc_check.sh @@ -406,7 +406,12 @@ lxc_net_check=0 # Passe sur les différents tests while test "$lxc_net" -eq 1 # Boucle tant que la connexion internet du conteneur n'est pas réparée. do REBOOT_CONTENEUR - sleep 30 + if [ "$(uname -m)" == "aarch64" ] + then + sleep 30 + else + sleep 3 + fi sudo lxc-ls -f CHECK_LXC_NET lxc_net=$?