diff options
author | ramon <ramongomez@us.es> | 2016-04-11 07:18:55 +0000 |
---|---|---|
committer | ramon <ramongomez@us.es> | 2016-04-11 07:18:55 +0000 |
commit | c680f93660157e2720cf878e2fb6f5f212fb6c81 (patch) | |
tree | c71501ce1ff9eb351762cbb8b9d3cf21acaab886 | |
parent | ebe57095c2c713acfd1bd062b82f96d4c6d2205f (diff) |
#744: Incluir comprobación de bloqueo de disco en función {{{ogRestoreDiskImage}}}.
git-svn-id: https://opengnsys.es/svn/branches/version1.1@4875 a21b9725-9963-47de-94b9-378ad31fedc9
-rwxr-xr-x | client/engine/Image.lib | 4 | ||||
-rw-r--r-- | client/shared/etc/lang.ca_ES.conf | 1 | ||||
-rw-r--r-- | client/shared/etc/lang.en_GB.conf | 3 | ||||
-rw-r--r-- | client/shared/etc/lang.es_ES.conf | 1 |
4 files changed, 8 insertions, 1 deletions
diff --git a/client/engine/Image.lib b/client/engine/Image.lib index 9a4b13d7..49e65e22 100755 --- a/client/engine/Image.lib +++ b/client/engine/Image.lib @@ -631,6 +631,10 @@ if ogIsImageLocked "$IMGFILE"; then ogRaiseError $OG_ERR_LOCKED "$MSG_IMAGE $1, $2.$IMGTYPE" return $? fi +if ogIsDiskLocked $3; then + ogRaiseError $OG_ERR_LOCKED "$MSG_DISK $3" + return $? +fi # Solicitamos la generación de la instruccion a ejecutar PROGRAM=$(ogRestoreImageSyntax $IMGFILE $DISK) diff --git a/client/shared/etc/lang.ca_ES.conf b/client/shared/etc/lang.ca_ES.conf index 4a219659..ac515a76 100644 --- a/client/shared/etc/lang.ca_ES.conf +++ b/client/shared/etc/lang.ca_ES.conf @@ -47,6 +47,7 @@ MSG_MOUNTREADONLY="Sistema de archivos montado solo de lectura" # Mensajes complementarios para las ayudas. MSG_64BIT="64 bits" +MSG_DISK="disc" MSG_ERROR="Error" MSG_EXAMPLE="Exemple" MSG_FORMAT="Format" diff --git a/client/shared/etc/lang.en_GB.conf b/client/shared/etc/lang.en_GB.conf index b8ffba6a..2fe28267 100644 --- a/client/shared/etc/lang.en_GB.conf +++ b/client/shared/etc/lang.en_GB.conf @@ -46,7 +46,8 @@ MSG_MOUNT="Filesystem already mounted" MSG_MOUNTREADONLY="Filesystem mounted read-only" # Help auxiliary menssages. -MSG_64BIT="64 bit" +MSG_64BIT="64-bit" +MSG_DISK="disk" MSG_ERROR="Error" MSG_EXAMPLE="Example" MSG_FORMAT="Format" diff --git a/client/shared/etc/lang.es_ES.conf b/client/shared/etc/lang.es_ES.conf index a5487d6e..08209526 100644 --- a/client/shared/etc/lang.es_ES.conf +++ b/client/shared/etc/lang.es_ES.conf @@ -47,6 +47,7 @@ MSG_MOUNTREADONLY="Sistema de archivos montado solo de lectura" # Mensajes complementarios para las ayudas. MSG_64BIT="64 bits" +MSG_DISK="disco" MSG_ERROR="Error" MSG_EXAMPLE="Ejemplo" MSG_FORMAT="Formato" |