From 13c2ca1f48db8b680639d70e36ca71c80ccf1ed8 Mon Sep 17 00:00:00 2001
From: adv <adv@uma.es>
Date: Wed, 31 May 2017 13:05:27 +0000
Subject: [PATCH] =?UTF-8?q?#768=20#528=20Multiples=20ogLives=20en=20la=20C?=
 =?UTF-8?q?ACHE.=20=20Los=20componentes=20del=20ogLive=20est=C3=A1n=20todo?=
 =?UTF-8?q?s=20dentro=20de=20un=20solo=20directorio,=20identificado=20con?=
 =?UTF-8?q?=20su=20nombre=20y=20versi=C3=B3n.=20En=20el=20servidor=20est?=
 =?UTF-8?q?=C3=A1n=20en=20tftpboot/ogLivexxx=20y=20en=20la=20cache=20se=20?=
 =?UTF-8?q?almacenar=C3=A1n=20en=20/boot/ogLiveXXX?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

El tftp del busybox permite acceder a subdirectorios del recurso tftp.

git-svn-id: https://opengnsys.es/svn/branches/version1.1@5326 a21b9725-9963-47de-94b9-378ad31fedc9
---
 includes/etc/initramfs-tools/scripts/ogfunctions | 13 ++++++++-----
 1 file changed, 8 insertions(+), 5 deletions(-)

diff --git a/includes/etc/initramfs-tools/scripts/ogfunctions b/includes/etc/initramfs-tools/scripts/ogfunctions
index 27efc6d..0204b5c 100644
--- a/includes/etc/initramfs-tools/scripts/ogfunctions
+++ b/includes/etc/initramfs-tools/scripts/ogfunctions
@@ -365,9 +365,12 @@ ogGetROOTSERVER ()
 #@version 0.9
 #@author Antonio J. Doblas. Universidad de Malaga.
 #@date    2011/05/24
-#@author Irina Gómez. ETSII Universidad de Sevilla
 #@version 1.1.0 - Permite varios ogLive dentro de subdirectorios
+#@author Irina Gómez. ETSII Universidad de Sevilla
 #@date    2017/04/27
+#@version 1.1.0 - Se permite varios ogLives en la CACHE
+#@author Antonio J. Doblas Viso. Universidad de Malaga
+#@date    2017/05/31
 #*/ ##
 
 ogUpdateInitrd ()
@@ -380,7 +383,7 @@ ogUpdateInitrd ()
 	# Salir si no se detecta caché.
 	[ -z "$TYPE" ] && return
 	mount -t $TYPE LABEL=CACHE /tmp/cache || return
-	mkdir -p /tmp/cache/boot
+	mkdir -p /tmp/cache/boot/$OGLIVEDIR
 	
 	
 	# comparamos los del server
@@ -391,13 +394,13 @@ ogUpdateInitrd ()
 
 	
 	#comparamos los de la cache
-	CACHEVMLINUZ=`cat /tmp/cache/boot/ogvmlinuz.sum`
-	CACHEINITRD=`cat /tmp/cache/boot/oginitrd.img.sum`
+	CACHEVMLINUZ=`cat /tmp/cache/boot/$OGLIVEDIR/ogvmlinuz.sum`
+	CACHEINITRD=`cat /tmp/cache/boot/$OGLIVEDIR/oginitrd.img.sum`
 	
 	echo "MD5 on SERVER: $SERVERVMLINUZ $SERVERINITRD"
 	echo "MD5 on  CACHE: $CACHEVMLINUZ $CACHEINITRD"
 	
-	cd /tmp/cache/boot
+	cd /tmp/cache/boot/$OGLIVEDIR || mkdir -p /tmp/cache/boot/$OGLIVEDIR
 	
 	if [ "$CACHEVMLINUZ" != "$SERVERVMLINUZ" ]
 	then