diff options
| author | adv <adv@uma.es> | 2018-01-21 19:53:40 +0000 |
|---|---|---|
| committer | adv <adv@uma.es> | 2018-01-21 19:53:40 +0000 |
| commit | 82c68fa1ed414640b860bafac974d26cfa23974d (patch) | |
| tree | 39d29d966e95004e63f4c1826da36e5573772e5b /client/shared | |
| parent | bd597f67058c2867ca2c0a9d0be195bfaf130dee (diff) | |
#822 refactorización de updateBootCache
git-svn-id: https://opengnsys.es/svn/branches/version1.1@5569 a21b9725-9963-47de-94b9-378ad31fedc9
Diffstat (limited to 'client/shared')
| -rwxr-xr-x | client/shared/scripts/updateBootCache | 25 |
1 files changed, 13 insertions, 12 deletions
diff --git a/client/shared/scripts/updateBootCache b/client/shared/scripts/updateBootCache index cce700bb..f2e4e72b 100755 --- a/client/shared/scripts/updateBootCache +++ b/client/shared/scripts/updateBootCache @@ -6,7 +6,8 @@ #@param 1 #@param ejemplo: #@return -#@exception OG_ERR_FORMAT formato incorrecto. +#@exception OG_ERR_NOTCACHE # 15 si cache no existe 15 +#@exception OG_ERR_NOTFOUND=2 # Fichero o dispositivo no encontrado. #@note #@todo: #@version 1.0.1 - requiere el gestor de arranque grub2dos @@ -18,22 +19,28 @@ #@version 1.1.0 - Se permite varios ogLives en la CACHE #@author Antonio J. Doblas Viso. Universidad de Malaga #@date 2017/05/31 +#@version 1.1.0 - Limpieza de codigo, control errores +#@author Antonio J. Doblas Viso. Universidad de Malaga +#@date 2018-01-21 #*/ ## OGLIVEDIR=${oglivedir:-"ogLive"} OGBTFTP="/opt/oglive/tftpboot/$OGLIVEDIR" OGBCACHE="$OGCAC/boot/$OGLIVEDIR" -ogMountCache || exit 1 + +#control de errores +[ -d "$OGBTFTP" ] || exit $(ogRaiseError $OG_ERR_NOTFOUND "$OGBTFTP"; echo $?) +ogMountCache || exit $(ogRaiseError $OG_ERR_NOTCACHE "CACHE "; echo $?) [ -d $OGBCACHE ] || mkdir -p $OGBCACHE # comparamos los del server - SERVERVMLINUZ=`cat ${OGBTFTP}/ogvmlinuz.sum` - SERVERINITRD=`cat ${OGBTFTP}/oginitrd.img.sum` + SERVERVMLINUZ=`cat ${OGBTFTP}/ogvmlinuz.sum 2>/dev/null` + SERVERINITRD=`cat ${OGBTFTP}/oginitrd.img.sum 2>/dev/null` #comparamos los de la cache - CACHEVMLINUZ=`cat ${OGBCACHE}/ogvmlinuz.sum` - CACHEINITRD=`cat ${OGBCACHE}/oginitrd.img.sum` + CACHEVMLINUZ=`cat ${OGBCACHE}/ogvmlinuz.sum 2>/dev/null` + CACHEINITRD=`cat ${OGBCACHE}/oginitrd.img.sum 2>/dev/null` echo "MD5 on SERVER: $SERVERVMLINUZ $SERVERINITRD" echo "MD5 on CACHE: $CACHEVMLINUZ $CACHEINITRD" @@ -56,9 +63,3 @@ ogMountCache || exit 1 echo $DOREBOOT # [ "$DOREBOOT" == "true" ] && busybox reboot -f - -#TODO: Comprobar si es necesario -#cp -prv cp ${OGBTFTP}/ ${OGBCACHE} - -#TODO -#/opt/opengnsys/lib/grub4dos/bootlace.com /dev/sda |