Have to eval when looking for oldest backup to remove so file globbing is done

[ovzbpc.git] / bpcdump

diff --git a/bpcdump b/bpcdump
index b27689412908c2a63a231eb35b4bc81349574260..1b5e88f56f287f8d3b660c90f8ae004772aa632d 100755 (executable)
--- a/bpcdump
+++ b/bpcdump
@@ -37,29 +37,32 @@ cleanup()
     ret="$1"
     shift
     msg="$*"
-    [ -z "$ret" ] && ret=-1
-    [ -z "$msg" ] && msg=undef
-    restartve
-    if [ "$ret" = "0" ]; then
-       echo "$(date)" | tee -a "$INFO"
-       echo "cleanup message: $msg" | tee -a "$INFO"
-       echo "exit $ret" | tee -a "$INFO"
-       touch "$EXTVEIDFS/good"
+    if [ -z "$INFO" ]; then
+       echo "$0: $msg" >&2
     else
-       echo "$(date)" | tee -a "$INFO" >&2
-       echo "cleanup message: $msg" | tee -a "$INFO" >&2
-       echo "exit $ret" | tee -a "$INFO" >&2
-       touch "$EXTVEIDFS/bad"
+       [ -z "$ret" ] && ret=-1
+       [ -z "$msg" ] && msg=undef
+       restartve
+       if [ "$ret" = "0" ]; then
+           echo "$(date)" | 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 "cleanup message: $msg" | tee -a "$INFO" >&2
+           echo "exit $ret" | tee -a "$INFO" >&2
+           touch "$EXTVEIDFS/bad"
+       fi
+       [ -n "$backupwarn" ] && echo "WARNINGS FOUND" >> "$INFO"
     fi
-    [ -n "$backupwarn" ] && echo "WARNINGS FOUND" >> "$INFO"
     exit $ret
 }
 
 # MAIN
 
 if [ $(whoami) != "root" ]; then
-    echo "$0: script requires super-user privileges" >&2
-    exit 1
+    cleanup 1 "script requires super-user privileges"
 fi
 
 set $(vzctl status $VEID)
@@ -69,34 +72,29 @@ unset exist mounted running backupwarn
 [ "$5" = "running" ] && running=1
 
 if ! mount | grep -q "on $EXTFS"; then
-    echo "$0: $EXTFS is not mounted" >&2
-    exit 1
+    cleanup 1 "$EXTFS is not mounted"
 else
     echo "$EXTFS is mounted"
 fi
 
 if [ -z "$exist" ]; then
-    echo "$0: VEID $VEID does not exist" >&2
-    exit 1
+    cleanup 1 "VEID $VEID does not exist"
 else
     echo "VEID $VEID exists"
 fi
 
 if [ ! -d "$VEMNT" ]; then
-    echo "$0: mount point for VEID $VEID does not exist" >&2
-    exit 1
+    cleanup 1 "mount point for VEID $VEID does not exist"
 else
     echo "VEID $VEID has private mount point"
 fi
 
 if ! grep -q "$VEMNT[  ]" /etc/fstab; then
-    echo "$0: mount point for VEID $VEID not in /etc/fstab" >&2
-    exit 1
+    cleanup 1 "mount point for VEID $VEID not in /etc/fstab"
 fi
 
 if ! mount | grep -q "on $VEMNT"; then
-    echo "$0: $VEMNT is not mounted" >&2
-    exit 1
+    cleanup 1 "$VEMNT is not mounted"
 else
     echo "VEID $VEID is mounted on $VEMNT"
 fi
@@ -123,7 +121,7 @@ fi
 # Before we begin writing, remove old backup dirs until we have room
 dstblks=$(df -P "$EXTFS" | grep "$EXTFS" | awk '{ print $4 }')
 while [ $dstblks -le $srcblks ]; do
-    oldest=$(cd $EXTFS && ls -ltd "ve${VEID}*" 2>/dev/null | tail -1 | \
+    oldest=$(cd $EXTFS && eval ls -ltd "ve${VEID}*" 2>/dev/null | tail -1 | \
        awk '{ print $8 }')
     if [ -d "$oldest" ]; then
        echo "Removing old backup $oldest from $EXTFS"
@@ -142,9 +140,9 @@ if [ -d "$EXTVEIDFS" ]; then
     mv "$EXTVEIDFS" "${EXTVEIDFS}.old"
 else
     rm -rf "$EXTVEIDFS"
-    mkdir "$EXTVEIDFS"
-    date > "$EXTVEIDFS/begin"
 fi
+mkdir "$EXTVEIDFS"
+date > "$EXTVEIDFS/begin"
 if ! cd "$EXTVEIDFS"; then
     cleanup 1 "cannot change into $EXTVEIDFS directory"
 fi