version1.0 #368 - Adaptando el antiguo ogclient a boot-tools

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

9 files changed, 54 insertions, 23 deletions

diff --git a/client/boot-tools/INSTALL.es.txt b/client/boot-tools/INSTALL.es.txt
index b357595b..d77418bd 100644
--- a/client/boot-tools/INSTALL.es.txt
+++ b/client/boot-tools/INSTALL.es.txt
@@ -4,19 +4,20 @@
 1. Comprobar la conexión a internet, sobre todo si usas proxy. El hecho de que te funcione apt-get no significa que tengas el proxy configurado.
 1. Descargar del subversion la estrucutura del cliente.
 
-# reubicacion al trunk/client/boot
+# reubicacion al trunk/client/boot-tools
 
 Proceso:
 0. Si ya tenemos un /var/lib/tftpboot/ogclient lo renombramos por si acaso.
 1. Descargar del subversion la rama ogClient.
 3. Ejecutar el instalador: 
 
+URLSVNBASE="http://www.opengnsys.es/svn/branches/version1.0/client"
 mv /opt/opengnsys/tftpboot/ogclient/ /opt/opengnsys/tftpboot/ogclientTrunk;
-svn checkout http://www.opengnsys.es/svn/branches/ogClient /tmp/opengnsys_installer/opengnsys/installer/ogClient;
-svn checkout http://www.opengnsys.es/svn/branches/version1.0/client/shared/ /tmp/opengnsys_installer/opengnsys/client/shared;
-svn checkout http://www.opengnsys.es/svn/branches/version1.0/client/engine/ /tmp/opengnsys_installer/opengnsys/client/engine;
+svn checkout ${URLSVNBASE}/boot-tools /tmp/opengnsys_installer/opengnsys/client/boot-tools;
+svn checkout ${URLSVNBASE}/shared/ /tmp/opengnsys_installer/opengnsys/client/shared;
+svn checkout ${URLSVNBASE}/engine/ /tmp/opengnsys_installer/opengnsys/client/engine;
 find /tmp/opengnsys_installer/ -name .svn -type d -exec rm -fr {} \; 2>/dev/null;
-/tmp/opengnsys_installer/opengnsys/installer/ogClient/ogClientGeneratorV2.sh;
+/tmp/opengnsys_installer/opengnsys/client/boot-tools/ogClientGeneratorV2.sh;
 
 
 
diff --git a/client/boot-tools/clientstructure/etc/initramfs-tools/hooks/oghooks b/client/boot-tools/clientstructure/etc/initramfs-tools/hooks/oghooks
index 15fd01cc..51f452ff 100755
--- a/client/boot-tools/clientstructure/etc/initramfs-tools/hooks/oghooks
+++ b/client/boot-tools/clientstructure/etc/initramfs-tools/hooks/oghooks
@@ -49,7 +49,7 @@ copy_exec /sbin/mount.cifs
 #mkdir -p ${DESTDIR}/opt/opengnsys/lib/engine
 #cp -prv /opt/opengnsys/client/lib/engine ${DESTDIR}/opt/opengnsys/lib/engine
 
-rm -fr ${DESTDIR}/lib/modules/2.6.32-21-generic-pae/kernel/drivers/net/atl*
+#rm -fr ${DESTDIR}/lib/modules/2.6.32-21-generic-pae/kernel/drivers/net/atl*
 manual_add_modules cifs
 manual_add_modules smbfs
 manual_add_modules atl1e
diff --git a/client/boot-tools/clientstructure/etc/initramfs-tools/scripts/ogfunctions b/client/boot-tools/clientstructure/etc/initramfs-tools/scripts/ogfunctions
index ce2716db..ef6f00c8 100644
--- a/client/boot-tools/clientstructure/etc/initramfs-tools/scripts/ogfunctions
+++ b/client/boot-tools/clientstructure/etc/initramfs-tools/scripts/ogfunctions
@@ -294,7 +294,7 @@ IP=$IPOPTS
                         break;
                 fi
 
-                case ${IP} in
+            case ${IP} in
 		    none|off)
 			# Do nothing
 			;;
diff --git a/client/boot-tools/clientstructure/etc/initramfs-tools/scripts/oginit b/client/boot-tools/clientstructure/etc/initramfs-tools/scripts/oginit
index a6c05d5e..d91afaee 100755
--- a/client/boot-tools/clientstructure/etc/initramfs-tools/scripts/oginit
+++ b/client/boot-tools/clientstructure/etc/initramfs-tools/scripts/oginit
@@ -41,9 +41,12 @@ mountroot ()
 	. /scripts/functions
 	. /scripts/ogfunctions
 
+	sleep 2
+
 	[ "$ogdebug" == "true" ] && ogYesNo --timeout 5 --default no "Stop before get OG variables: y/N "
     [ $? == 0 ] && sh || echo " "
 
+
 	set -a
 	log_success_msg "Checking kernel parameters"
 	ogExportKernelParameters 
diff --git a/client/boot-tools/clientstructure/etc/inittab b/client/boot-tools/clientstructure/etc/inittab
index 94c30028..6d3277fc 100644
--- a/client/boot-tools/clientstructure/etc/inittab
+++ b/client/boot-tools/clientstructure/etc/inittab
@@ -7,7 +7,7 @@
 #::askfirst:/bin/sh
 # Start an "askfirst" shell on /dev/tty2-4
 #tty1::respawn:/sbin/getty 38400 tty1
-tty1::respawn:/opt/opengnsys/etc/preinit/defaultTESTING.sh
+tty1::respawn:/opt/opengnsys/etc/preinit/default.sh
 tty2::respawn:/sbin/getty 38400 tty2
 tty3::respawn:/sbin/getty 38400 tty3
 tty4::respawn:/sbin/getty 38400 tty4
diff --git a/client/boot-tools/clientstructure/etc/profile.d/loadenviron.sh b/client/boot-tools/clientstructure/etc/profile.d/loadenviron.sh
index 0bf46a3e..c6e8f790 100755
--- a/client/boot-tools/clientstructure/etc/profile.d/loadenviron.sh
+++ b/client/boot-tools/clientstructure/etc/profile.d/loadenviron.sh
@@ -57,6 +57,9 @@ if [ -d $OPENGNSYS ]; then
         	source $i 
     	done
     fi
+    
+    source /tmp/net-eth* 2>/dev/null
+    
     # Añadir dependencia de arquitectura
     ARCH=$(ogGetArch)
     if [ -n "$ARCH" ]; then
diff --git a/client/boot-tools/kernelParameterOG.es.txt b/client/boot-tools/kernelParameterOG.es.txt
index 890652b4..4ec96c8a 100644
--- a/client/boot-tools/kernelParameterOG.es.txt
+++ b/client/boot-tools/kernelParameterOG.es.txt
@@ -2,28 +2,45 @@
 KERNEL ogclient/ogvmlinuz
 initrd=ogclient/oginitrd.img 
 
-
+### PARAMETROS ESTANDAR DEl KERNEL
+## indicamos al kernel que proceso a iniciar el Opengnsys
  boot=oginit
  
+ vga=788 
+irqpoll 
+acpi=on 
+ 
+ip=dhcp
+ip=
+ 
+### PARAMETROS ESPECIFICOS DE OG.
+ # Indicamos al cliente OG, cuando termine su proceso que incie el init (/opt/opengnsys/etc/preinit/default.sh)
+ # si no se utiliza este parametro por defecto usa init.
  oginit=init|/bin/bash
 
  
+ #por defecto todos los servicios OG, los considera ubicados en el next-server (parámetro indicado en el servicio dhcp)
+# en el caso de que queramos que indicar que REPO (/opt/opengnsys/images) está en otro equipo utilizar este parámetro ogrepo
  ogrepo=ip del repositorio
  
+ # fichero donde se encuentra el rootfs que usara el ogvmlinuz y el oginitrd.img
+ # hay dos formatos, el img (fichero modificable desde el OG server), o el sqfs (fichero solo lectura del img) 
  og2nd=sqfs|img 
+ 
+ #protocolo de acceso al og2nd.
  ogprotocol=smb|nfs
+ 
+ # modo de funcionalidad del browser con shell root activa.
  ogactiveadmin=true|false
+ 
+ #modo de depuración en el proceso de arranque del cliente.
  ogdebug=true|false
  
-  vga=788 
-  irqpoll 
-  acpi=on 
+
+#modulo especial de la tarjeta de red.
+ognetmodule
+
+
   
 
-FIXME: en la version actual
-repo=iprepoman
-IP
 
-TODO: en la proxima version
-ogrepo
-ip
\ No newline at end of file
diff --git a/client/boot-tools/ogClientGeneratorV2.sh b/client/boot-tools/ogClientGeneratorV2.sh
index 21449267..8cb514dc 100755
--- a/client/boot-tools/ogClientGeneratorV2.sh
+++ b/client/boot-tools/ogClientGeneratorV2.sh
@@ -156,7 +156,7 @@ ogClient2ndSqfs
 
 ##################### FASE 9. algunos detallas del pxe
 #dejamos ficheros de ejemplo para el pxe y el nfs
-ogClientConfpxe
+#ogClientConfpxe
 ##################### FIN FASE 9. algunos detallas del pxe
 
 
diff --git a/client/boot-tools/ogClientManager.lib b/client/boot-tools/ogClientManager.lib
index 85cd868f..438ee56a 100644
--- a/client/boot-tools/ogClientManager.lib
+++ b/client/boot-tools/ogClientManager.lib
@@ -1,7 +1,7 @@
 
 ogClientVar()
 {
-export SVNCLIENTDIR=/tmp/opengnsys_installer/opengnsys/installer/ogClient
+export SVNCLIENTDIR=/tmp/opengnsys_installer/opengnsys/client/boot-tools
 export SVNCLIENTSTRUCTURE=/tmp/opengnsys_installer/opengnsys/client/shared
 export SVNCLIENTENGINE=/tmp/opengnsys_installer/opengnsys/client/engine
 
@@ -232,9 +232,16 @@ cp -pr ${SVNCLIENTSTRUCTURE}/lib/fonts $OGCLIENTMOUNT/usr/local/lib/fonts
 mkdir -p $OGCLIENTMOUNT/usr/local/Trolltech/QtEmbedded-4.5.1/lib/
 mkdir -p $OGCLIENTMOUNT/usr/local/QtEmbedded-4.6.2/lib/
 mkdir -p $OGCLIENTMOUNT/usr/local/QtEmbedded-4.6.3/lib/
-ln -fs $OGCLIENTMOUNT/usr/local/lib/fonts /usr/local/Trolltech/QtEmbedded-4.5.1/lib/fonts
-ln -fs $OGCLIENTMOUNT/usr/local/lib/fonts /usr/local/QtEmbedded-4.6.2/lib/fonts
-ln -fs $OGCLIENTMOUNT/usr/local/lib/fonts /usr/local/QtEmbedded-4.6.3/lib/fonts
+#ln -fs $OGCLIENTMOUNT/usr/local/lib/fonts /usr/local/Trolltech/QtEmbedded-4.5.1/lib/fonts
+#ln -fs $OGCLIENTMOUNT/usr/local/lib/fonts /usr/local/QtEmbedded-4.6.2/lib/fonts
+#ln -fs $OGCLIENTMOUNT/usr/local/lib/fonts /usr/local/QtEmbedded-4.6.3/lib/fonts
+cp -pr ${SVNCLIENTSTRUCTURE}/lib/fonts $OGCLIENTMOUNT/usr/local/Trolltech/QtEmbedded-4.5.1/lib/fonts 
+cp -pr ${SVNCLIENTSTRUCTURE}/lib/fonts $OGCLIENTMOUNT/usr/local/QtEmbedded-4.6.2/lib/fonts 
+cp -pr ${SVNCLIENTSTRUCTURE}/lib/fonts $OGCLIENTMOUNT/usr/local/QtEmbedded-4.6.3/lib/fonts
+
+
+
+
 if [ $? -ne 0 ]
 then 
 	errorAndLog "$FUNCNAME(): Linking Browser fonts : ERROR"