Versión 1.0.4, #546 #547: Instalar y actualizar usando el nuevo cliente ogLive

git-svn-id: https://opengnsys.es/svn/branches/version1.0@3258 a21b9725-9963-47de-94b9-378ad31fedc9

5 files changed, 20 insertions, 26 deletions

diff --git a/admin/WebConsole/comandos/RestaurarImagen.php b/admin/WebConsole/comandos/RestaurarImagen.php
index 50436fc1..5e5bd250 100644
--- a/admin/WebConsole/comandos/RestaurarImagen.php
+++ b/admin/WebConsole/comandos/RestaurarImagen.php
@@ -171,38 +171,29 @@ function pintaParticiones($cmd,$configuraciones,$idordenadores,$cc,$ambito,$idam
 					echo '<TD ><input type=radio idcfg="'.$cc.'" id="'.$icp.'" name="particion" value='.$tbKeys[$k]["numpar"].'></TD>'.chr(13);
 					echo '<TD align=center>&nbsp;'.$tbKeys[$k]["numpar"].'&nbsp;</TD>'.chr(13);
 					echo '<TD align=center>&nbsp;'.$tbKeys[$k]["tipopar"].'&nbsp;</TD>'.chr(13);
-					
-					//echo '<TD>&nbsp;'.$tbKeys[$k]["nombreso"].'&nbsp;</TD>'.chr(13);
 					echo '<TD align=center>&nbsp;'.tomaNombresSO($tbKeys[$k]["numpar"],$idordenadores).'&nbsp;</TD>'.chr(13);	
-					
-					//echo'<TD align=center>&nbsp;'.$tbKeys[$k]["sistemafichero"].'&nbsp;</TD>'.chr(13);
 					echo'<TD align=center>&nbsp;'.tomaSistemasFicheros($tbKeys[$k]["numpar"],$idordenadores).'&nbsp;</TD>'.chr(13);
-
-					//echo'<TD align=rigth>&nbsp;'.formatomiles($tbKeys[$k]["tamano"]).'&nbsp;</TD>'.chr(13);
 					echo'<TD align=center>&nbsp;'.tomaTamano($tbKeys[$k]["numpar"],$idordenadores).'&nbsp;</TD>'.chr(13);	
-									
 					echo '<TD>'.HTMLSELECT_imagenes($cmd,$tbKeys[$k]["idimagen"],$tbKeys[$k]["numpar"],$tbKeys[$k]["codpar"],$icp,true,$idordenadores,$ambito).'</TD>';
 					echo '<TD>'.HTMLSELECT_imagenes($cmd,$tbKeys[$k]["idimagen"],$tbKeys[$k]["numpar"],$tbKeys[$k]["codpar"],$icp,false,$idordenadores,$ambito).'</TD>';
-					//Clonación
-
-
-                    $metodos="UNICAST=UNICAST-CACHE".chr(13);
-                    $metodos.="UNICAST-DIRECT=UNICAST-DIRECT".chr(13);
-                    $metodos.="MULTICAST " . mcast_syntax($cmd,$ambito,$idambito) . "=MULTICAST-CACHE".chr(13);
-                    $metodos.="MULTICAST-DIRECT " . mcast_syntax($cmd,$ambito,$idambito) . "=MULTICAST-DIRECT".chr(13);
-                    $metodos.="TORRENT " . torrent_syntax($cmd,$ambito,$idambito) . "=TORRENT-CACHE";
-
-                    $TBmetodos["UNICAST-CACHE"]=1;
-                    $TBmetodos["UNICAST-DIRECT"]=2;
-                    $TBmetodos["MULTICAST-CACHE"]=3;
-                    $TBmetodos["MULTICAST-DIRECT"]=4;
-                    $TBmetodos["TORRENT-CACHE"]=5;
 
+					//Clonación
+					$metodos="UNICAST=UNICAST-CACHE".chr(13);
+					$metodos.="UNICAST-DIRECT=UNICAST-DIRECT".chr(13);
+					$metodos.="MULTICAST " . mcast_syntax($cmd,$ambito,$idambito) . "=MULTICAST-CACHE".chr(13);
+					$metodos.="MULTICAST-DIRECT " . mcast_syntax($cmd,$ambito,$idambito) . "=MULTICAST-DIRECT".chr(13);
+					$metodos.="TORRENT " . torrent_syntax($cmd,$ambito,$idambito) . "=TORRENT-CACHE";
+
+					$TBmetodos["UNICAST-CACHE"]=1;
+					$TBmetodos["UNICAST-DIRECT"]=2;
+					$TBmetodos["MULTICAST-CACHE"]=3;
+					$TBmetodos["MULTICAST-DIRECT"]=4;
+					$TBmetodos["TORRENT-CACHE"]=5;
 
 					$idxc=$_SESSION["protclonacion"];
 					echo '<TD>'.HTMLCTESELECT($metodos,"protoclonacion_".$icp,"estilodesple","",$TBmetodos[$idxc],100).'</TD>';
 				}
-				echo '<TR>'.chr(13);
+				echo '</TR>'.chr(13);
 			}
 		}
 	}	
diff --git a/doc/CHANGELOG.es.txt b/doc/CHANGELOG.es.txt
index 2cab179f..b44cd84a 100644
--- a/doc/CHANGELOG.es.txt
+++ b/doc/CHANGELOG.es.txt
@@ -29,6 +29,8 @@ Tickets resueltos en módulo OpenGnSys Client:
 #520	ogLive modprobe no utiliza los modulos correspondientes
 #525	Seleccionar el tipo de arranque de sistemas Windows (reinicio o en caliente)
 #529	Cliente ogLive basado en Ubuntu 12.04
+#546	ogLive en modo PXE durante el proceso de arranque no continuará hasta que la interfaz de red esté correctamente configurada
+#547	oglive basado en Ubuntu 12.04 no detecta ficheros de configuración de DNS
 
 Tickets resueltos en módulo OpenGnSys Server:
 #426	isAlive: control de los servicios OpenGnSys
diff --git a/installer/opengnsys_installer.sh b/installer/opengnsys_installer.sh
index 0ddba0d3..8d7e7518 100755
--- a/installer/opengnsys_installer.sh
+++ b/installer/opengnsys_installer.sh
@@ -1217,8 +1217,8 @@ function copyClientFiles()
 function clientCreate()
 {
 	local DOWNLOADURL="http://$OPENGNSYS_SERVER/downloads"
-	#local FILENAME=ogLive-oneiric-3.0.0-14-generic-r2439.iso	# 1.0.3-rc1
-	local FILENAME=ogLive-precise-3.2.0-23-generic-pae-r3017.iso	# 1.0.4-rc1
+	#local FILENAME=ogLive-precise-3.2.0-23-generic-pae-r3017.iso	# 1.0.4-rc1
+	local FILENAME=ogLive-precise-3.2.0-23-generic-r3257.iso	# 1.0.4-rc2
 	local TARGETFILE=$INSTALL_TARGET/lib/$FILENAME
 	local TMPDIR=/tmp/${FILENAME%.iso}
  
diff --git a/installer/opengnsys_makecompress.sh b/installer/opengnsys_makecompress.sh
index 2587343a..11a7f9f8 100755
--- a/installer/opengnsys_makecompress.sh
+++ b/installer/opengnsys_makecompress.sh
@@ -10,7 +10,7 @@
 
 
 # Variables
-SVNURL="http://www.opengnsys.es/svn/trunk/"
+SVNURL="http://www.opengnsys.es/svn/branches/version1.0/"
 SVNREV=$(LANG=C svn info $SVNURL | awk '/Last Changed Rev:/ {print "r"$4}')
 
 # Descargar repositorio SVN
diff --git a/installer/opengnsys_update.sh b/installer/opengnsys_update.sh
index f08b8cbf..b746b578 100755
--- a/installer/opengnsys_update.sh
+++ b/installer/opengnsys_update.sh
@@ -611,7 +611,8 @@ function compileServices()
 function updateClient()
 {
 	local DOWNLOADURL="http://$OPENGNSYS_SERVER/downloads"
-	local FILENAME=ogLive-precise-3.2.0-23-generic-pae-r3017.iso	# 1.0.4-rc1
+	#local FILENAME=ogLive-precise-3.2.0-23-generic-pae-r3017.iso	# 1.0.4-rc1
+	local FILENAME=ogLive-precise-3.2.0-23-generic-r3257.iso	# 1.0.4-rc2
 	local SOURCEFILE=$DOWNLOADURL/$FILENAME
 	local TARGETFILE=$INSTALL_TARGET/lib/$FILENAME
 	local SOURCELENGTH