diff options
| author | ramon <ramongomez@us.es> | 2011-06-15 17:53:07 +0000 |
|---|---|---|
| committer | ramon <ramongomez@us.es> | 2011-06-15 17:53:07 +0000 |
| commit | 3b85b6a2bf18f18e1876901747adc9c0228090a8 (patch) | |
| tree | a9170172d053059c7f03696b8a74472fb6357381 | |
| parent | ecd8d9ac7a4419618f471815d748a51923d90aea (diff) | |
Corregir erratas en instalador y actualizador al copiar arranque del cliente (modifica #413).
git-svn-id: https://opengnsys.es/svn/trunk@2066 a21b9725-9963-47de-94b9-378ad31fedc9
| -rwxr-xr-x | installer/opengnsys_installer.sh | 1 | ||||
| -rwxr-xr-x | installer/opengnsys_update.sh | 11 |
2 files changed, 7 insertions, 5 deletions
diff --git a/installer/opengnsys_installer.sh b/installer/opengnsys_installer.sh index d9b7bd99..797f8ab9 100755 --- a/installer/opengnsys_installer.sh +++ b/installer/opengnsys_installer.sh @@ -1109,6 +1109,7 @@ function clientCreate() return 1 fi echoAndLog "${FUNCNAME}(): Copying Client files" + mkdir -p $TMPDIR mount -o loop,ro $TARGETFILE $TMPDIR cp -vr $TMPDIR/* $INSTALL_TARGET/tftpboot umount $TMPDIR diff --git a/installer/opengnsys_update.sh b/installer/opengnsys_update.sh index 42c74b13..c61044a5 100755 --- a/installer/opengnsys_update.sh +++ b/installer/opengnsys_update.sh @@ -506,8 +506,8 @@ function compileServices() # Actualizar nuevo cliente para OpenGnSys 1.0 function updateClient() { - local DOWNLOADURL=http://www.opengnsys.es/downloads - local FILENAME=ogclient-1.0.1-lucid-32bit.tar.gz + local DOWNLOADURL="http://www.opengnsys.es/downloads" + local FILENAME=ogclient-1.0.2-natty-32bit-beta00-rev2046.iso local SOURCEFILE=$DOWNLOADURL/$FILENAME local TARGETFILE=$INSTALL_TARGET/lib/$FILENAME local SOURCELENGTH @@ -515,8 +515,8 @@ function updateClient() local TMPDIR=/tmp/${FILENAME%.iso} # Comprobar si debe actualizarse el cliente. - SOURCELENGTH=$(wget --spider $SOURCEFILE | LANG=C awk '/Length:/ {print $2}') - TARGETLENGTH=$(ls -l $TARGETFILE | awk '{print $5}' 2>/dev/null) + SOURCELENGTH=$(LANG=C wget --spider $SOURCEFILE 2>&1 | awk '/Length:/ {print $2}') + TARGETLENGTH=$(ls -l $TARGETFILE 2>/dev/null | awk '{print $5}') if [ "$SOURCELENGTH" != "$TARGETLENGTH" ]; then echoAndLog "${FUNCNAME}(): Loading Client" wget $DOWNLOADURL/$FILENAME -O $TARGETFILE @@ -528,7 +528,8 @@ function updateClient() echoAndLog "${FUNCNAME}(): Client is already loaded" fi # Montar la imagen ISO del ogclient, actualizar ficheros y desmontar. - echoAndLog "${FUNCNAME}(): Updatting ogclient files" + echoAndLog "${FUNCNAME}(): Updating ogclient files" + mkdir $TMPDIR mount -o loop,ro $TARGETFILE $TMPDIR rsync -irplt $TMPDIR/* $INSTALL_TARGET/tftpboot umount $TMPDIR |