From 233afaaf947e2e02fde98b098ed79d8f4664766a Mon Sep 17 00:00:00 2001
From: Daniel Dehennin <daniel.dehennin@ac-dijon.fr>
Date: Fri, 21 Sep 2018 09:04:58 +0200
Subject: [PATCH] Init ONE: download latest ISO point release
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

* postservice/99-init-hapy-master: use “eole-iso” to retrieve informations.

Ref: #25055
---
 postservice/99-init-hapy-master | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/postservice/99-init-hapy-master b/postservice/99-init-hapy-master
index 59a5ed6..cfbc3a1 100755
--- a/postservice/99-init-hapy-master
+++ b/postservice/99-init-hapy-master
@@ -33,18 +33,26 @@ function runOneCmd()
 	return ${?}
 }
 
+if [ $(CreoleGet activer_proxy_client 'non') = 'oui' ]
+then
+    PROXY_SERVER=$(CreoleGet proxy_client_adresse)
+    PROXY_PORT=$(CreoleGet proxy_client_port)
+    PROXY_OPT="--proxy http://${PROXY_SERVER}:${PROXY_PORT}"
+fi
+
 DISKSIZE=$(CreoleGet hapy_init_master_disk_size)
 DISKNAME="DSK-${DISKSIZE}-Go"
 DISKDESC="Disque vide de ${DISKSIZE} Go"
 
 VERSIONISO=$(CreoleGet hapy_init_master_iso_version)
 MAJORVERSION=${VERSIONISO:0:3}
-ISONAME="ISO-Eole-${VERSIONISO}-amd64"
-ISODESC="Image ISO EOLE Stable ${VERSIONISO} 64 bits"
-ISOURL="http://eole.ac-dijon.fr/pub/iso/EOLE-${MAJORVERSION}/${VERSIONISO}/eole-${VERSIONISO}-alternate-amd64.iso"
+POINT_RELEASE=$(eole-iso ${PROXY_OPT} --release ${VERSIONISO} get-last-point-release)
+ISONAME=$(eole-iso ${PROXY_OPT} --release ${VERSIONISO} get-iso-name)
+ISODESC="Image ISO EOLE ${POINT_RELEASE} 64 bits"
+ISOURL=$(eole-iso ${PROXY_OPT} --release ${VERSIONISO} get-iso-url)
 
-TMPLNAME="InstallEole-${VERSIONISO}-amd64"
-TMPLDESC="Modèle de VM permettant d'installer un module EOLE ${VERSIONISO} 64 bits (non persistente)"
+TMPLNAME="install-eole-${POINT_RELEASE}-amd64"
+TMPLDESC="Modèle de VM permettant d'installer un module EOLE ${POINT_RELEASE} 64 bits (non persistente)"
 
 #echo "########### suppr ${DISKNAME} ###############"
 #oneimage delete ${DISKNAME}
@@ -109,7 +117,7 @@ EOF
 			break
 		fi
 	done
-    rm -f "/tmp/eole-${VERSIONISO}-alternate-amd64.iso"
+    rm -f "/tmp/${ISONAME}"
 else
     echo "***** ${ISONAME} existe déjà *****"
 fi