From 0af9fde7cfe57a066744f175531c040407fc3015 Mon Sep 17 00:00:00 2001
From: adv <adv@uma.es>
Date: Thu, 26 May 2011 14:45:31 +0000
Subject: [PATCH] version 1.0.2 #404 boot-tools registro proceso inicio

git-svn-id: https://opengnsys.es/svn/branches/version1.0@2038 a21b9725-9963-47de-94b9-378ad31fedc9
---
 .../etc/initramfs-tools/scripts/ogfunctions   | 49 +++++++++++--------
 1 file changed, 29 insertions(+), 20 deletions(-)

diff --git a/clientstructure/etc/initramfs-tools/scripts/ogfunctions b/clientstructure/etc/initramfs-tools/scripts/ogfunctions
index 20a2c6a..8a39932 100644
--- a/clientstructure/etc/initramfs-tools/scripts/ogfunctions
+++ b/clientstructure/etc/initramfs-tools/scripts/ogfunctions
@@ -20,25 +20,31 @@ return 0
 
 ogExportVarEnvironment ()
 {
-	#puntos de accesos al servidor ogprotocol=nfs
-	export NFSROOTBOOT="/var/lib/tftpboot"
-	export NFSCLIENTDIR="/opt/opengnsys/client"
-	export NFSLOGDIR="/opt/opengnsys/log/clients"
-	export NFSIMGDIR="/opt/opengnsys/images"
-	#puntos de accesos al servidor ogprotocol=smb
-	export SMBROOTBOOT="tftpboot"
-	export SMBCLIENTDIR="ogclient"
-	export SMBLOGDIR="oglog"
-	export SMBIMGDIR="ogimages"
+	export CFGINITRD="/tmp/initrd.cfg"
+	echo "puntos de accesos al servidor ogprotocol=nfs" >> $CFGINITRD
+	export NFSROOTBOOT="/var/lib/tftpboot" && echo "NFSROOTBOOT=$NFSROOTBOOT" >> $CFGINITRD	
+	export NFSCLIENTDIR="/opt/opengnsys/client" && echo "NFSCLIENDIR=$NFSCLIENTDIR" >> $CFGINITRD	
+	export NFSLOGDIR="/opt/opengnsys/log/clients" && echo "NFSLOGDIR=$NFSLOGDIR" >> $CFGINITRD	
+	export NFSIMGDIR="/opt/opengnsys/images" && echo "NFSIMGDIR=$NFSIMGDIR" >> $CFGINITRD	
+	echo "puntos de accesos al servidor ogprotocol=smb" >> $CFGINITRD
+	export SMBROOTBOOT="tftpboot"  && echo "SMBROOTBOOT=$SMBROOTBOOT" >> $CFGINITRD	
+	export SMBCLIENTDIR="ogclient" && echo "SMBCLIENTDIR=$SMBCLIENTDIR" >> $CFGINITRD
+	export SMBLOGDIR="oglog" && echo "SMBLOGDIR=$SMBLOGDIR" >> $CFGINITRD
+	export SMBIMGDIR="ogimages" && echo "SMBIMGDIR=$SMBIMGDIR" >> $CFGINITRD
 
-	#puntos de montaje local ram o cache
-	export LOCALCLIENTDIR="/opt/opengnsys"
-	export LOCALLOGDIR="/opt/opengnsys/log"
-	export LOCALIMGDIR="/opt/opengnsys/images"
-	export LOCALROOTBOOT="/opt/og2fs/tftpboot"		#punto de montaje del contendor tftpboot
-	export LOCALROOTIMG="/opt/og2fs/2ndfs"			#punto de montaje donde se accede al 2nd FS mediante loop
-	export LOCALROOTRAM="/opt/og2fs/1stfs"			#punto de montaje para unionfs
-	export LOCALROOTUNION="/opt/og2fs/unionfs"		#punto de union entreo LOCALROOTIMG y LOCALROOTRAM
+	echo "puntos de montaje local para los contenedores" >> $CFGINITRD
+	export LOCALROOTBOOT="/opt/og2fs/tftpboot"	&& echo "LOCALROOTBOOT=$LOCALROOTBOOT" >> $CFGINITRD
+	export LOCALCLIENTDIR="/opt/opengnsys" && echo "LOCALCLIENTDIR=$LOCALCLIENTDIR" >> $CFGINITRD		
+	export LOCALLOGDIR="/opt/opengnsys/log" && echo "LOCALLOGDIR=$LOCALLOGDIR" >> $CFGINITRD
+	export LOCALIMGDIR="/opt/opengnsys/images" && echo "LOCALIMGDIR=$LOCALIMGDIR" >> $CFGINITRD
+	
+	echo "puntos de montajes para realizar la integración unionfs entre el initrd y el sistema root" >> $CFGINITRD
+	#punto de montaje donde se accede al 2nd FS mediante loop
+	export LOCALROOTIMG="/opt/og2fs/2ndfs"	&& echo "LOCALROOTIMG=$LOCALROOTIMG" >> $CFGINITRD		
+	#punto de montaje para unionfs 
+	export LOCALROOTRAM="/opt/og2fs/1stfs" && echo "LOCALROOTRAM=$LOCALROOTRAM" >> $CFGINITRD				
+	#punto de union entreo LOCALROOTIMG y LOCALROOTRAM
+	export LOCALROOTUNION="/opt/og2fs/unionfs" && echo "LOCALROOTUNION=$LOCALROOTUNION" >> $CFGINITRD			
 	##INFORMACION DE OTRAS VARIABLES OBTENDIAS EN OTRAS FUNCIONES.
 	#ogGetROOTSERVER()  ip del servidor pxe, valor obtenido automaticamente desde dhcpd.
 	#IPV4DDR
@@ -120,6 +126,7 @@ ogGetROOTSERVER ()
 		fi
 	fi
 	export ROOTSERVER
+	echo "ROOTSERVER=$ROOTSERVER" >> $CFGINITRD
 return 0
 }	
 
@@ -345,8 +352,10 @@ done
 if [ -n "${DEVICE}" ]; then	
     . /tmp/net-${DEVICE}.conf
     DEVICECFG="/tmp/net-${DEVICE}"
-	export $DEVICECFG
-	export $DEVICE
+	export DEVICECFG
+	export DEVICE
+	echo "DEVICE=$DEVICE" >> $CFGINITRD
+	echo "DEVICECFG=$DEVICECFG" >> $CFGINITRD
 	echo "exportando variable DEVICE con valor = $DEVICE y el DEVICECFG con valor $DEVICECFG"    
 else
     # source any interface as not exaclty specified