diff options
| author | ramon <ramongomez@us.es> | 2016-02-05 07:12:26 +0000 |
|---|---|---|
| committer | ramon <ramongomez@us.es> | 2016-02-05 07:12:26 +0000 |
| commit | 8e65e89600769ccd32425c1e399efe922b3b72b7 (patch) | |
| tree | 115aff3758f55370f1440a8b580db182ef8d7f72 /client/engine/Image.lib | |
| parent | 78a0db7e6bd391b81fa20d4267f0073671a6308d (diff) | |
#730 #734: Corregir erratas al obtener datos de variables en varias funciones.
git-svn-id: https://opengnsys.es/svn/branches/version1.1@4794 a21b9725-9963-47de-94b9-378ad31fedc9
Diffstat (limited to 'client/engine/Image.lib')
| -rwxr-xr-x | client/engine/Image.lib | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/client/engine/Image.lib b/client/engine/Image.lib index 5e799968..7940b4f5 100755 --- a/client/engine/Image.lib +++ b/client/engine/Image.lib @@ -627,7 +627,7 @@ fi # Procesar parámetros. DISK=$(ogDiskToDev "$3") || return $? IMGFILE=$(ogGetPath "$1" "$2.mbr") || return $? -[ -r "$IMGFILE" ] || ogRaiseError OG_ERR_NOTFOUND "$IMGFILE" || return $? +[ -r "$IMGFILE" ] || ogRaiseError $OG_ERR_NOTFOUND "$IMGFILE" || return $? # Restaurar imagen del MBR. dd if="$IMGFILE" of="$DISK" bs=512 count=1 || ogRaiseError $OG_ERR_IMAGE "$1 $IMGFILE" || return $? @@ -663,7 +663,7 @@ fi # Procesar parámetros. DISK=$(ogDiskToDev "$3") || return $? IMGFILE=$(ogGetPath "$1" "$2.mbr") || return $? -[ -r "$IMGFILE" ] || ogRaiseError OG_ERR_NOTFOUND "$IMGFILE" || return $? +[ -r "$IMGFILE" ] || ogRaiseError $OG_ERR_NOTFOUND "$IMGFILE" || return $? # Restaurar imagen del MBR. dd if="$IMGFILE" of="$DISK" bs=446 count=1 || ogRaiseError $OG_ERR_IMAGE "$1 $IMGFILE" || return $? @@ -802,7 +802,7 @@ function ogGetImageProgram () { local IMGFILE IMGFILE=$(ogGetPath "$1" "$2.img") || return $? -[ -r "$IMGFILE" ] || ogRaiseError OG_ERR_NOTFOUND "$IMGFILE" || return $? +[ -r "$IMGFILE" ] || ogRaiseError $OG_ERR_NOTFOUND "$IMGFILE" || return $? ogGetImageInfo $IMGFILE | awk -F: '{print $1}' } @@ -811,7 +811,7 @@ function ogGetImageCompressor () { local IMGFILE IMGFILE=$(ogGetPath "$1" "$2.img") || return $? -[ -r "$IMGFILE" ] || ogRaiseError OG_ERR_NOTFOUND "$IMGFILE" || return $? +[ -r "$IMGFILE" ] || ogRaiseError $OG_ERR_NOTFOUND "$IMGFILE" || return $? ogGetImageInfo $IMGFILE | awk -F: '{print $2}' } @@ -819,7 +819,7 @@ function ogGetImageType () { local IMGFILE IMGFILE=$(ogGetPath "$1" "$2.img") || return $? -[ -r "$IMGFILE" ] || ogRaiseError OG_ERR_NOTFOUND "$IMGFILE" || return $? +[ -r "$IMGFILE" ] || ogRaiseError $OG_ERR_NOTFOUND "$IMGFILE" || return $? #partimage -B gui=no imginfo "$IMGFILE" 2>&1 | \ # awk '/^Filesystem/ {sub(/\.\.+/," "); sub(/fs$/,""); print toupper($2);}' ogGetImageInfo $IMGFILE | awk -F: '{print $3}' @@ -841,7 +841,7 @@ fi [ $# == 2 ] || ogRaiseError $OG_ERR_FORMAT || return $? # Error si el fichero de imagen no es accesible. IMGFILE=$(ogGetPath "$1" "$2.img") || return $? -[ -r "$IMGFILE" ] || ogRaiseError OG_ERR_NOTFOUND "$IMGFILE" || return $? +[ -r "$IMGFILE" ] || ogRaiseError $OG_ERR_NOTFOUND "$IMGFILE" || return $? # Devuelve el tamaño de la imagen en KB. #partimage -B gui=no imginfo "$IMGFILE" 2>&1 | \ |