diff options
| author | ramon <ramongomez@us.es> | 2014-03-20 10:18:16 +0000 |
|---|---|---|
| committer | ramon <ramongomez@us.es> | 2014-03-20 10:18:16 +0000 |
| commit | 5962edd0e946112b7727e7c59e631d7dae7e9cd4 (patch) | |
| tree | 3bb5f0b6a41bf3d3884b5d67eb57c644cbdb979d /client/engine/PostConf.lib | |
| parent | 4dd4e425d5f0002aaa251e6f6a8b6d45cd224100 (diff) | |
#640: Evitar errores duplicados en llamadas a {{{ogMount}}} y comprobar error de montaje en script {{{bootOs}}}.
git-svn-id: https://opengnsys.es/svn/branches/version1.0@4198 a21b9725-9963-47de-94b9-378ad31fedc9
Diffstat (limited to 'client/engine/PostConf.lib')
| -rwxr-xr-x | client/engine/PostConf.lib | 16 |
1 files changed, 6 insertions, 10 deletions
diff --git a/client/engine/PostConf.lib b/client/engine/PostConf.lib index f85b239f..24fb00d8 100755 --- a/client/engine/PostConf.lib +++ b/client/engine/PostConf.lib @@ -278,7 +278,7 @@ EOF function ogInstallLinuxClient () { # Variables locales. -local PART MNTDIR CLIENTFILE i SBINDIR ETCDIR RCLOCAL +local MNTDIR CLIENTFILE i SBINDIR ETCDIR RCLOCAL # Si se solicita, mostrar ayuda. if [ "$*" == "help" ]; then ogHelp "$FUNCNAME" "$FUNCNAME int_ndisk int_filesys" \ @@ -289,10 +289,8 @@ fi # Error si no se reciben 2 parámetros. [ $# == 2 ] || ogRaiseError $OG_ERR_FORMAT || return $? # Obtener sistema de archvios. -PART="$(ogDiskToDev $1 $2)" || return $? -# Comprobar si el sistema de archivos no está bloqueado. -MNTDIR=$(ogMount $1 $2) 2>/dev/null -[ -n "$MNTDIR" ] || ogRaiseError OG_ERR_PARTITION "$1, $2" || return $? +MNTDIR=$(ogMount $1 $2) || return $? + # Comprobar si existe el cliente y los directorios y ficheros destino. CLIENTFILE=$OGLIB/ogclient/ogAdmLnxClient [ -f $CLIENTFILE ] || ogRaiseError $OG_ERR_FOUND "$CLIENTFILE" || return $? @@ -355,7 +353,7 @@ ogUnlock $1 $2 function ogInstallWindowsClient () { # Variables locales. -local PART MNTDIR CLIENTFILE i SBINDIR ETCDIR RCLOCAL +local MNTDIR CLIENTFILE i SBINDIR ETCDIR RCLOCAL # Si se solicita, mostrar ayuda. if [ "$*" == "help" ]; then ogHelp "$FUNCNAME" "$FUNCNAME int_ndisk int_filesys" \ @@ -365,10 +363,8 @@ fi # Error si no se reciben 3 parámetros. [ $# == 3 ] || ogRaiseError $OG_ERR_FORMAT || return $? # Obtener sistema de archvios. -PART="$(ogDiskToDev $1 $2)" || return $? -# Comprobar si el sistema de archivos no está bloqueado. -MNTDIR=$(ogMount $1 $2) 2>/dev/null -[ -n "$MNTDIR" ] || ogRaiseError OG_ERR_PARTITION "$1, $2" || return $? +MNTDIR=$(ogMount $1 $2) || return $? + # Comprobar si existe el cliente y los directorios y ficheros destino. CLIENTFILE=$OGLIB/ogclient/ogAdmWinClient.exe [ -f $CLIENTFILE ] || ogRaiseError $OG_ERR_FOUND "$CLIENTFILE" || return $? |