summaryrefslogtreecommitdiffstats
path: root/client/boot-tools/boottoolsfunctions.lib
diff options
context:
space:
mode:
authorramon <ramongomez@us.es>2017-03-06 10:39:51 +0000
committerramon <ramongomez@us.es>2017-03-06 10:39:51 +0000
commitabfdc97bed43583556a8f601bbc1cff8548cea91 (patch)
tree8268e64fabafce5d7f72724ab00f9c533538ae13 /client/boot-tools/boottoolsfunctions.lib
parent73d2b75552e408ec7399b51404e32b76416c7e3c (diff)
#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
Diffstat (limited to 'client/boot-tools/boottoolsfunctions.lib')
-rwxr-xr-xclient/boot-tools/boottoolsfunctions.lib16
1 files changed, 11 insertions, 5 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"