Index: tareas_puppet/servidores_aula/instala-sun-java6/manifests/init.pp
===================================================================
--- tareas_puppet/servidores_aula/instala-sun-java6/manifests/init.pp	(revision 247)
+++ tareas_puppet/servidores_aula/instala-sun-java6/manifests/init.pp	(revision 248)
@@ -10,15 +10,15 @@
 
         exec { "sun-java6":
 	path => "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",
-        command => "debconf-set-selections < /var/log/preseed.sun ; apt-get update ; apt-get install -y sun-java6-bin sun-java6-jre sun-java6-plugin sun-java6-fonts",
+        command => "mount /proc -t proc /proc; debconf-set-selections < /var/log/preseed.sun ; apt-get update ; apt-get install -y --force-yes sun-java6-bin sun-java6-jre sun-java6-plugin sun-java6-fonts; umount /proc",
         require => File["/var/log/preseed.sun"],
-        unless => "ls /var/lib/dpkg/info/sun-java6-jre.list",
+        unless => "dpkg -l | grep sun-java6-jre | grep 6-26-0lenny1 | grep ii",
 	notify => Exec["nuevos_enlaces-java"]
 	}
 
         exec { "nuevos_enlaces-java":
 	path => "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",
-        command => "update-alternatives --set java /usr/lib/jvm/java-6-sun/jre/bin/java; update-alternatives --set java_vm /usr/lib/jvm/java-6-sun/jre/bin/java_vm; update-alternatives --set javaws /usr/lib/jvm/java-6-sun/jre/bin/javaws; update-alternatives --set iceweasel-javaplugin.so /usr/lib/jvm/java-6-sun/jre/lib/amd64/libnpjp2.so; ",
+        command => "update-java-alternatives -s /usr/lib/jvm/java-6-sun",
 	refreshonly => true,
 	}
 
@@ -30,15 +30,15 @@
 
         exec { "sun-java6-thinclient":
 	path => "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",
-        command => "chroot /opt/ltsp/i386 debconf-set-selections < /var/log/preseed.sun ; chroot /opt/ltsp/i386 apt-get update ; chroot /opt/ltsp/i386 apt-get install -y sun-java6-bin sun-java6-jre sun-java6-plugin sun-java6-fonts",
+        command => "chroot /opt/ltsp/i386 mount /proc -t proc /proc; chroot /opt/ltsp/i386 debconf-set-selections < /var/log/preseed.sun ; chroot /opt/ltsp/i386 apt-get update ; chroot /opt/ltsp/i386 apt-get install -y --force-yes sun-java6-bin sun-java6-jre sun-java6-plugin sun-java6-fonts; chroot /opt/ltsp/i386 umount /proc",
         require => File["/opt/ltsp/i386/var/log/preseed.sun"],
-        unless => "ls /opt/ltsp/i386/var/lib/dpkg/info/sun-java6-jre.list",
+        unless => "chroot /opt/ltsp/i386 dpkg -l | grep sun-java6-jre | grep 6-26-0lenny1 | grep ii",
 	notify => Exec["nuevos_enlaces-java-thinclient"];
 	}
 
         exec { "nuevos_enlaces-java-thinclient":
 	path => "/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin",
-        command => "chroot /opt/ltsp/i386 update-alternatives --set java /usr/lib/jvm/java-6-sun/jre/bin/java; chroot /opt/ltsp/i386 update-alternatives --set java_vm /usr/lib/jvm/java-6-sun/jre/bin/java_vm; chroot /opt/ltsp/i386 update-alternatives --set javaws /usr/lib/jvm/java-6-sun/jre/bin/javaws; ",
+        command => "chroot /opt/ltsp/i386 update-java-alternatives -s /usr/lib/jvm/java-6-sun",
 	refreshonly => true,
 	notify => Exec[crear-imagen-sun-java6];
 	}
Index: tareas_puppet/servidores_aula/instala-sun-java6/leeme.txt
===================================================================
--- tareas_puppet/servidores_aula/instala-sun-java6/leeme.txt	(revision 247)
+++ tareas_puppet/servidores_aula/instala-sun-java6/leeme.txt	(revision 248)
@@ -1,9 +1,9 @@
 BREVE DESCRIPCION DE LA EJECUCION DEL MODULO
 --------------------------------------------
 
-Tarea que nos permite instalar el sun-java6 en los servidores de aula e imagen de clientes.
+Tarea que nos permite instalar el sun-java6 (ver 6.0.26) en los servidores de aula e imagen de clientes.
 
-También rehace los enlaces de /etc/alternatives
+También rehace los enlaces de /etc/alternatives para que apunten al plugin correcto.
 
 INSTRUCCIONES DE INSTALACION DEL MODULO
 ---------------------------------------
@@ -10,9 +10,10 @@
 
 Desempaquetar en /etc/puppet/modules
 Incluir la linea include "nombre_modulo" en /etc/puppet/manifests/classes/clase-especifica.pp
+Añadir las lineas de los paquetes dentro de /etc/puppet/files/mayhave.ltspserver del servidor nfs.
+(En este caso son sun-java6-jre sun-java6-bin sun-java6-plugin sun-java6-fonts
+-------------------------------------------------------------------------------------------------
 
-------------------------------------------------
-
-11-Marzo-2011.
-Francisco Rodrigo L�pez
-Administrador inform�tico del IES Javier Garc�a T�llez
+26-Octubre-2011.
+Francisco Rodrigo Lopez
+Administrador informatico del IES Javier Garcia Tellez
Index: tareas_puppet/servidores_aula/instala-sun-java6.tgz
===================================================================
Cannot display: file marked as a binary type.
svn:mime-type = application/octet-stream
