diff options
| author | irina <irinagomez@us.es> | 2014-08-04 09:35:37 +0000 |
|---|---|---|
| committer | irina <irinagomez@us.es> | 2014-08-04 09:35:37 +0000 |
| commit | 0edd937c5eeb935728055e2b892b06cd4ba1a5bc (patch) | |
| tree | c665e2957d905f099f24e49ba0ecf1b241e76889 /client/shared/scripts/restoreBaseImage | |
| parent | edcf62da7f564b213640abd2d1a023a7dc33eb72 (diff) | |
restoreBaseImage: se corrige errata al comprobar bloqueo de la imagen y sistema de fichero del sistema operativo que contiene cuando se restaura desde cache
git-svn-id: https://opengnsys.es/svn/branches/version1.0@4360 a21b9725-9963-47de-94b9-378ad31fedc9
Diffstat (limited to 'client/shared/scripts/restoreBaseImage')
| -rwxr-xr-x | client/shared/scripts/restoreBaseImage | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/client/shared/scripts/restoreBaseImage b/client/shared/scripts/restoreBaseImage index fc777878..e30134e0 100755 --- a/client/shared/scripts/restoreBaseImage +++ b/client/shared/scripts/restoreBaseImage @@ -65,13 +65,13 @@ ogIsSyncImage REPO "$2" $IMGEXT || exit $(ogRaiseError session $OG_ERR_DONTSYN IMGEXT="img" # Comprobamos si la imagen o la particion estan bloqueada: -ogIsImageLocked "$1" "$2.$IMGEXT" && exit $(ogRaiseError session $OG_ERR_LOCKED "$1 $2.$IMGEXT"; echo $?) +ogIsImageLocked "REPO" "$2.$IMGEXT" && exit $(ogRaiseError session $OG_ERR_LOCKED "$1 $2.$IMGEXT"; echo $?) ogIsLocked "$3" "$4" && exit $(ogRaiseError session $OG_ERR_LOCKED "$3 $4"; echo $?) # Detectamos el sistema de ficheros de la imagen # TODO ogGetImageInfo -DIRMOUNT=$(ogMountImage "$1" "$2") -ogWaitSyncImage "$1" "$2" "$IMGEXT" "mounted" || exit $(ogRaiseError session $OG_ERR_DONTMOUNT_IMAGE "$1 $2 $IMGEXT: time_out."; echo $?) +DIRMOUNT=$(ogMountImage "REPO" "$2") +ogWaitSyncImage "REPO" "$2" "$IMGEXT" "mounted" || exit $(ogRaiseError session $OG_ERR_DONTMOUNT_IMAGE "$1 $2 $IMGEXT: time_out."; echo $?) IMGFSTYPE=$(head -1 $DIRMOUNT/ogimg.info |cut -d: -f3) # Comprobamos si el sistema de ficheros se puede montar @@ -139,7 +139,8 @@ ogRestoreInfoImage $3 $4 2>&1 | tee -a $OGLOGCOMMAND if [ "$(ogGetCaller)" != "restoreDiffImage" ];then if which configureOsCustom &>/dev/null; then ogEcho log session "[90] configureOsCustom" - configureOsCustom "$3" "$4" + # CDC: enviamos todos los parametros. + configureOsCustom "$1" "$2" "$3" "$4" else ogEcho log session "[90] $MSG_HELP_configureOs" configureOs $3 $4 |