#774: Crear fichero con tamaño suficiente para ogLive de 64 bits e instalar en último lugar librerías para compatibilidad con 32 bits.

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

2 files changed, 16 insertions, 7 deletions

diff --git a/client/boot-tools/boottoolsfunctions.lib b/client/boot-tools/boottoolsfunctions.lib
index 76a1bae8..06f0dcb8 100755
--- a/client/boot-tools/boottoolsfunctions.lib
+++ b/client/boot-tools/boottoolsfunctions.lib
@@ -23,8 +23,12 @@ export BTSVNOG2=/tmp/opengnsys_installer/opengnsys2
 export BTTARGETDIR=/var/lib/tftpboot/ogclient/
 export BTROOTFSIMG=${BTTARGETDIR}ogclient.img
 export BTROOTFSMNT=${BTTARGETDIR}ogclientmount
-# tamaño maximo limitado por schroot 2GB
-export BTVIRTUALDISKSIZE=2000
+if [ "$OSARCH" = "i386" ]; then
+        # tamaño maximo limitado por schroot 2GB para 32 bits
+        export BTVIRTUALDISKSIZE=2000 
+else
+        export BTVIRTUALDISKSIZE="3G"
+fi
 export BTROOTFSIMGLABEL=ogClient
 
 export LOG_FILE=/tmp/boot-tools_installation.log
@@ -181,10 +185,12 @@ fi
 chown -R root:opengnsys $BTTARGETDIR
 
 #echo "$FUNCNAME(): Creando el disco virtual con tamaño máximo de  $BTVIRTUALDISKSIZE MB" 
-dd if=/dev/zero of=$BTROOTFSIMG bs=1048576 count=$BTVIRTUALDISKSIZE
-	#qemu-img create $BTROOTFSIMG 3G	
+if [ "$OSARCH" = "i386" ]; then
+        dd if=/dev/zero of=$BTROOTFSIMG bs=1048576 count=$BTVIRTUALDISKSIZE
 	#dd if=/dev/zero of=$BTROOTFSIMG bs=1k count=$OGCLIENTSIZEKB   # necesita 500MB
-
+else
+        qemu-img create $BTROOTFSIMG $BTVIRTUALDISKSIZE
+fi
 if [ $? -ne 0 ]
 then 
 	errorAndLog "$FUNCNAME(): Creando el disco virtual con tamaño maxima $BTVIRTUALDISKSIZE MB : ERROR" 
diff --git a/client/boot-tools/includes/usr/bin/boot-tools/boottoolsSoftwareInstall.sh b/client/boot-tools/includes/usr/bin/boot-tools/boottoolsSoftwareInstall.sh
index c2b92cea..469c266a 100755
--- a/client/boot-tools/includes/usr/bin/boot-tools/boottoolsSoftwareInstall.sh
+++ b/client/boot-tools/includes/usr/bin/boot-tools/boottoolsSoftwareInstall.sh
@@ -19,7 +19,7 @@ apt-get clean
 OSARCH=${OSARCH:-$(dpkg --print-architecture)}
 if [ "$OSARCH" != "i386" ]; then
         dpkg --add-architecture i386
-        PKGS32="lib32gcc1 lib32stdc++6 lib32z1"
+        PKGS32="lib32gcc1 lib32stdc++6 lib32z1 libc6-i386"
 fi
 apt-get update
 apt-get upgrade -y
@@ -64,7 +64,7 @@ console-setup console-setup/fontsize-fb47 select 8x16
 davfs2 davfs2/suid_file boolean false
 kexec-tools kexec-tools/load_kexec boolean true
 EOT
-apt-get -y install sshfs console-data kexec-tools davfs2 $PKGS32
+apt-get -y install sshfs console-data kexec-tools davfs2
 
 #comenzamos con la instalación de los paquetes a instalar.
 for group in `find /usr/bin/boot-tools/listpackages/ -name sw.*`
@@ -101,6 +101,9 @@ while read -e mod vers; do
 	fi
 done < <(dkms status 2>/dev/null | awk -F, '$3~/added/ {print $1,$2}')
 
+# Instalar en último lugar librarías de 32 bits para distribuciones de 64 bits.
+[ -n "$PKGS32" ] && apt-get -y install $PKGS32
+
 #Activamos el hook del oginitrd.img 
 mv /etc/initramfs-tools/oghooks /etc/initramfs-tools/hooks/