Ejecutables de cliente para 32 y 64 bits; nueva función {{{ogGetArch}}}

git-svn-id: https://opengnsys.es/svn/trunk@1047 a21b9725-9963-47de-94b9-378ad31fedc9

15 files changed, 20 insertions, 1 deletions

diff --git a/client/engine/Inventory.lib b/client/engine/Inventory.lib
index ed1ed511..7e731258 100755
--- a/client/engine/Inventory.lib
+++ b/client/engine/Inventory.lib
@@ -4,12 +4,25 @@
 #@brief   Librería o clase Inventory
 #@class   Inventory
 #@brief   Funciones para recogida de datos de inventario de hardware y software de los clientes.
-#@version 0.9
+#@version 0.9.2
 #@warning License: GNU GPLv3+
 #*/
 
 
 #/**
+#         ogGetArch
+#@brief   Devuelve el tipo de arquitectura del cliente.
+#@return  str_arch - Arquitectura (i386 para 32 bits, x86_64 para 64 bits).
+#@version 0.9.2 - Primera versión para OpenGnSys.
+#@author  Ramon Gomez, ETSII Universidad de Sevilla
+#@date    2010-07-17
+#*/ 
+function ogGetArch () {
+[ -d /lib64 ] && echo x86_64 || echo i386
+}
+
+
+#/**
 #         ogGetOsVersion int_ndisk int_npartition
 #@brief   Devuelve la versión del sistema operativo instalado en un sistema de archivos.
 #@param   int_ndisk      nº de orden del disco
diff --git a/client/nfsexport/bin/dosfsck b/client/nfsexport/bin/dosfsck
index 454b981b..b041e1bd 100755
--- a/client/nfsexport/bin/dosfsck
+++ b/client/nfsexport/bin/dosfsck
diff --git a/client/nfsexport/bin/dosfslabel b/client/nfsexport/bin/dosfslabel
new file mode 100755
index 00000000..007894bb
--- /dev/null
+++ b/client/nfsexport/bin/dosfslabel
diff --git a/client/nfsexport/bin/EACInterfaces b/client/nfsexport/bin/i386/EACInterfaces
index b63b1db1..b63b1db1 100755
--- a/client/nfsexport/bin/EACInterfaces
+++ b/client/nfsexport/bin/i386/EACInterfaces
diff --git a/client/nfsexport/bin/mkntfs b/client/nfsexport/bin/i386/mkntfs
index e3a32f2e..e3a32f2e 100755
--- a/client/nfsexport/bin/mkntfs
+++ b/client/nfsexport/bin/i386/mkntfs
diff --git a/client/nfsexport/bin/partprobe b/client/nfsexport/bin/i386/partprobe
index acba5c6e..acba5c6e 100755
--- a/client/nfsexport/bin/partprobe
+++ b/client/nfsexport/bin/i386/partprobe
diff --git a/client/nfsexport/bin/udp-receiver b/client/nfsexport/bin/i386/udp-receiver
index 6b230aaa..6b230aaa 100755
--- a/client/nfsexport/bin/udp-receiver
+++ b/client/nfsexport/bin/i386/udp-receiver
diff --git a/client/nfsexport/bin/udp-sender b/client/nfsexport/bin/i386/udp-sender
index 87789a05..87789a05 100755
--- a/client/nfsexport/bin/udp-sender
+++ b/client/nfsexport/bin/i386/udp-sender
diff --git a/client/nfsexport/bin/mkdosfs b/client/nfsexport/bin/mkdosfs
index 95ca7390..2fe2ce1f 100755
--- a/client/nfsexport/bin/mkdosfs
+++ b/client/nfsexport/bin/mkdosfs
diff --git a/client/nfsexport/bin/x86_64/mkntfs b/client/nfsexport/bin/x86_64/mkntfs
new file mode 100755
index 00000000..0ede0c4f
--- /dev/null
+++ b/client/nfsexport/bin/x86_64/mkntfs
diff --git a/client/nfsexport/bin/x86_64/ntfsresize b/client/nfsexport/bin/x86_64/ntfsresize
new file mode 100755
index 00000000..9f571121
--- /dev/null
+++ b/client/nfsexport/bin/x86_64/ntfsresize
diff --git a/client/nfsexport/bin/x86_64/partprobe b/client/nfsexport/bin/x86_64/partprobe
new file mode 100755
index 00000000..4721b33c
--- /dev/null
+++ b/client/nfsexport/bin/x86_64/partprobe
diff --git a/client/nfsexport/bin/x86_64/udp-receiver b/client/nfsexport/bin/x86_64/udp-receiver
new file mode 100755
index 00000000..11291de0
--- /dev/null
+++ b/client/nfsexport/bin/x86_64/udp-receiver
diff --git a/client/nfsexport/bin/x86_64/udp-sender b/client/nfsexport/bin/x86_64/udp-sender
new file mode 100755
index 00000000..d63c67fd
--- /dev/null
+++ b/client/nfsexport/bin/x86_64/udp-sender
diff --git a/client/nfsexport/etc/preinit/loadenviron.sh b/client/nfsexport/etc/preinit/loadenviron.sh
index 6db790e0..b52db44d 100755
--- a/client/nfsexport/etc/preinit/loadenviron.sh
+++ b/client/nfsexport/etc/preinit/loadenviron.sh
@@ -50,6 +50,12 @@ if [ -d $OPENGNSYS ]; then
         	source $i 
     	done
     fi
+    # Añadir dependencia de arquitectura
+    ARCH=$(ogGetArch)
+    if [ -n "$ARCH" ]; then
+        export PATH=$OGBIN/$ARCH:$PATH
+        export LD_LIBRARY_PATH=$OGLIB/$ARCH:$LD_LIBRARY_PATH
+    fi
     # Fichero de registros.
     export OGLOGFILE="$OGLOG/$(ogGetIpAddress).log"
     # FIXME Pruebas para grupos de ordenadores