diff options
| author | ramon <ramongomez@us.es> | 2011-01-14 13:24:46 +0000 |
|---|---|---|
| committer | ramon <ramongomez@us.es> | 2011-01-14 13:24:46 +0000 |
| commit | 5919303706c845d2480923b56b27f068d06aaa21 (patch) | |
| tree | dde3614e0cd29840ede14489851e0e7def786a57 | |
| parent | fb8c54b332e161a3624140f3b1579f2f8433b3cd (diff) | |
Incluir mbuffer para solucionar problemas de CRC en restauración por red.
git-svn-id: https://opengnsys.es/svn/trunk@1360 a21b9725-9963-47de-94b9-378ad31fedc9
| -rwxr-xr-x | client/engine/Image.lib | 24 | ||||
| -rwxr-xr-x | client/nfsexport/bin/i386/mbuffer | bin | 0 -> 666884 bytes | |||
| -rwxr-xr-x | client/nfsexport/bin/x86_64/mbuffer | bin | 0 -> 849416 bytes |
3 files changed, 9 insertions, 15 deletions
diff --git a/client/engine/Image.lib b/client/engine/Image.lib index 3fd4d3e8..3923fa79 100755 --- a/client/engine/Image.lib +++ b/client/engine/Image.lib @@ -37,7 +37,7 @@ function ogCreateImage () { # Variables locales -local PART IMGDIR IMGFILE ERRCODE +local PART PROGRAM IMGDIR IMGFILE ERRCODE # Si se solicita, mostrar ayuda. if [ "$*" == "help" ]; then @@ -63,26 +63,21 @@ trap "ogUnlock $1 $2; rm -f $IMGFILE" 1 2 3 6 9 TYPE="$(ogGetFsType $1 $2)" case "$TYPE" in - EXT[234]) - #partclone.extfs -c -C -F -s $PART | gzip -c > "$IMGFILE" # Muestra progreso - partclone.extfs -c -C -s $PART | gzip -c > "$IMGFILE" - ;; + EXT[234]) + PROGRAM=partclone.extfs ;; REISERFS|XFS|JFS) - partclone.dd -c -C -s $PART | gzip -c > "$IMGFILE" - ;; + PROGRAM=partclone.dd ;; NTFS|HNTFS) - partclone.ntfs -c -C -s $PART | gzip -c > "$IMGFILE" - ;; + PROGRAM=partclone.ntfs ;; FAT16|FAT32|HFAT16|HFAT32) - partclone.fat -c -C -s $PART | gzip -c > "$IMGFILE" - ;; + PROGRAM=partclone.fat ;; HFS|HFS+) - partclone.hfsp -c -C -s $PART | gzip -c > "$IMGFILE" - ;; + PROGRAM=partclone.hfsp ;; *) ogRaiseError $OG_ERR_PARTITION "$1 $2 $TYPE" return $? ;; esac +$PROGRAM -c -C -F -s $PART | mbuffer -q -m 70% | gzip -c > "$IMGFILE" # Controlar salida de error y desbloquear partición. ERRCODE=$? if [ $ERRCODE != 0 ]; then @@ -251,8 +246,7 @@ case "$IMGTYPE" in partimage -M -f3 -o -d -V0 -B gui=no -c -z1 --volume=0 restore $PART "$IMGFILE" ;; pgz) # Partclone / GZip - #gzip -dc "$IMGFILE" | partclone.restore -C -F -o "$PART" # Muestra progreso - gzip -dc "$IMGFILE" | partclone.restore -C -o "$PART" + gzip -dc "$IMGFILE" | mbuffer -q -m 70% | partclone.restore -C -F -o "$PART" ;; *) # Error si imagen no accesible o de tipo desconocido. ogRaiseError $OG_ERR_FORMAT diff --git a/client/nfsexport/bin/i386/mbuffer b/client/nfsexport/bin/i386/mbuffer Binary files differnew file mode 100755 index 00000000..913121fb --- /dev/null +++ b/client/nfsexport/bin/i386/mbuffer diff --git a/client/nfsexport/bin/x86_64/mbuffer b/client/nfsexport/bin/x86_64/mbuffer Binary files differnew file mode 100755 index 00000000..3c44dce8 --- /dev/null +++ b/client/nfsexport/bin/x86_64/mbuffer |