Turn off par2 use, clean up filenames, fix cleanup actions, fix dstmd5 calc.

diff --git a/bpcdump b/bpcdump
index 1be18ac0880a1035ef909a26f6c2b1ef4ce64cf4..b27689412908c2a63a231eb35b4bc81349574260 100755 (executable)
--- a/bpcdump
+++ b/bpcdump
@@ -16,6 +16,7 @@ VEID=1158
 VEDEV=/dev/vg0/ve$VEID
 VEMNT=/var/lib/vz/private/$VEID
 EXTFS=/media/esata
+unset WRITEPAR
 
 # FUNCTIONS
 
@@ -36,17 +37,17 @@ cleanup()
     ret="$1"
     shift
     msg="$*"
-    [ -n "$ret" ] && ret=-1
-    [ -n "$msg" ] && msg=undef
+    [ -z "$ret" ] && ret=-1
+    [ -z "$msg" ] && msg=undef
     restartve
     if [ "$ret" = "0" ]; then
        echo "$(date)" | tee -a "$INFO"
-       echo "$msg" | tee -a "$INFO"
+       echo "cleanup message: $msg" | tee -a "$INFO"
        echo "exit $ret" | tee -a "$INFO"
        touch "$EXTVEIDFS/good"
     else
        echo "$(date)" | tee -a "$INFO" >&2
-       echo "$msg" | tee -a "$INFO" >&2
+       echo "cleanup message: $msg" | tee -a "$INFO" >&2
        echo "exit $ret" | tee -a "$INFO" >&2
        touch "$EXTVEIDFS/bad"
     fi
@@ -155,12 +156,12 @@ VEID: $VEID
 Volume: $VEDEV
 dd_rescue log: ddrlog
 dd_rescue bad blocks: ddrbb
-img file: img
+image file: image
 
 +EOF+
-echo "copy $VEID device $VEDEV to img" | tee -a "$INFO"
+echo "copy $VEID device $VEDEV to $EXTVEIDFS/image" | tee -a "$INFO"
 time dd_rescue -Aqy 8192 -l "$EXTVEIDFS/ddrlog" -o "$EXTVEIDFS/ddrbb" \
-       $VEDEV "$EXTVEIDFS/img"
+       $VEDEV "$EXTVEIDFS/image"
 ret=$?
 if [ "$ret" != "0" ]; then
     backupwarn=1
@@ -168,32 +169,36 @@ if [ "$ret" != "0" ]; then
 fi
 echo "calculate md5sum for $VEDEV (src)" | tee -a "$INFO"
 srcmd5=$(md5sum "$VEDEV" 2>&1 | awk '{ print $1 }')
-echo "calculate md5sum for img (dst)" | tee -a "$INFO"
+echo "calculate md5sum for image (dst)" | tee -a "$INFO"
 
 # We're done with the partition.  We can restart the VE now.
 restartve
 
 # Continue on with archive and validation
-dstmd5=$(cd "$EXTVEIDFS" && time md5sum img >destmd5 2>&1 | awk '{ print $1 }')
-echo "$srcmd5 srcmd5" | tee -a "$INFO"
-echo "$dstmd5 dstmd5" | tee -a "$INFO"
+(cd "$EXTVEIDFS" && md5sum image >image.md5sum 2>&1 | awk '{ print $1 }')
+dstmd5=$(md5sum "$EXTVEIDFS/image" 2>&1 | awk '{ print $1 }')
+echo "$dstmd5 image.md5sum" > "$EXTVEIDFS/image.md5sum"
+echo "$srcmd5 source md5sum" | tee -a "$INFO"
+echo "$dstmd5 dest md5sum" | tee -a "$INFO"
 if [ "$srcmd5" != "$dstmd5" -o -z "$srcmd5" ]; then
     backupwarn=1
     echo "WARNING: md5 signatures do not match" | tee -a "$INFO" >&2
 else
     echo "md5 signatures match" | tee -a "$INFO"
 fi
-(cd "$EXTVEIDFS" && time par2 c img)
-ret=$?
-if [ "$ret" != "0" ]; then
-    backupwarn=1
-    echo "WARNING: redundancy failed: par2 returned $ret" | tee -a "$INFO"
-fi
-(cd "$EXTVEIDFS" && time par2 v img)
-ret=$?
-if [ "$ret" != "0" ]; then
-    backupwarn=1
-    echo "WARNING: redundancy inexact: par2 returned $ret" | tee -a "$INFO"
+if [ -n "$WRITEPAR" ]; then
+    (cd "$EXTVEIDFS" && time par2 c img)
+    ret=$?
+    if [ "$ret" != "0" ]; then
+       backupwarn=1
+       echo "WARNING: redundancy failed: par2 returned $ret" | tee -a "$INFO"
+    fi
+    (cd "$EXTVEIDFS" && time par2 v img)
+    ret=$?
+    if [ "$ret" != "0" ]; then
+       backupwarn=1
+       echo "WARNING: redundancy inexact: par2 returned $ret" | tee -a "$INFO"
+    fi
 fi
 
 cleanup 0 "successful"