summaryrefslogtreecommitdiffstats
path: root/client/shared/scripts/restoreBaseImage
diff options
context:
space:
mode:
authoririna <irinagomez@us.es>2013-10-14 12:01:19 +0000
committeririna <irinagomez@us.es>2013-10-14 12:01:19 +0000
commit3a61f948bfede7532ef16a36c3bf247d247f7461 (patch)
tree597f99028aea57c42878c2f2802f6de1c2ae0184 /client/shared/scripts/restoreBaseImage
parentf456755884247a72cf1af575a6e15c8c3fc92442 (diff)
#565 corrige error en nombre de funcion
git-svn-id: https://opengnsys.es/svn/branches/version1.0@4060 a21b9725-9963-47de-94b9-378ad31fedc9
Diffstat (limited to 'client/shared/scripts/restoreBaseImage')
-rwxr-xr-xclient/shared/scripts/restoreBaseImage5
1 files changed, 2 insertions, 3 deletions
diff --git a/client/shared/scripts/restoreBaseImage b/client/shared/scripts/restoreBaseImage
index 619e5daa..3af93d10 100755
--- a/client/shared/scripts/restoreBaseImage
+++ b/client/shared/scripts/restoreBaseImage
@@ -31,7 +31,7 @@ function onexit() {
local exit_status=$?
echo "$MSG_ERR_GENERIC $exit_status" |tee -a $OGLOGFILE $OGLOGSESSION
ogUnmountImage "$1" "$2" "$IMGEXT" &>/dev/null
- ogUnlock $3 $4 &>/dev/null
+ [ $exit_status -ne 4 ] && ogUnlock $3 $4 &>/dev/null
exit $exit_status
}
@@ -58,8 +58,7 @@ fi
REPOFILE=$(ogGetPath "REPO" "$2.$IMGEXT") || ogRaiseError $OG_ERR_NOTFOUND "REPO, $2.$IMGEXT"
# Comprobar que es sincronizable (con REPO)
-#file $REPOFILE | grep -i -e " BTRFS Filesystem" -e " ext4 filesystem " 2>&1 > /dev/null || ogRaiseError $OG_ERR_DONTSYNC_IMAGE "$1 $2"
-ogIsImageSync $1 "$2" $IMGEXT || ogRaiseError $OG_ERR_DONTSYNC_IMAGE "$1 $2"
+ogIsSyncImage $1 "$2" $IMGEXT || ogRaiseError $OG_ERR_DONTSYNC_IMAGE "$1 $2"
# Comprobamos si el sistema de ficheros se puede montar
ogMount "$3" "$4" &>/dev/null || RETVAL=$?