X-Git-Url: https://oss.titaniummirror.com/gitweb?a=blobdiff_plain;f=bpcdump;h=2978e53430444dfe76d1ce3d466aa557f5580205;hb=4113a0439950beb348322626fd0890221155932c;hp=fff636ab3e0bc119075185a75faee3b1535d418a;hpb=f75d9dbb7e51ac5d7a6884f05b77771b319968d1;p=ovzbpc.git

diff --git a/bpcdump b/bpcdump
index fff636a..2978e53 100755
--- a/bpcdump
+++ b/bpcdump
@@ -1,7 +1,9 @@
 #!/bin/bash
 #
 # bpcdump
-# Copyright (C) 2008 by Titanium Mirror, Inc.
+# Version: __appVersion__
+#
+# Copyright (C) 2008-2012 by Titanium Mirror, Inc.
 # Author: R. Steve McKown <smckown@titaniummirror.com>
 #
 # Dumps the BPC VEID to external storage.  It must have its storage on a
@@ -19,7 +21,7 @@ EXTFS=/media/esata
 unset WRITEPAR
 INFO=/dev/null
 export PATH=/usr/local/sbin:/usr/local/bin:/sbin:/usr/sbin:$PATH
-SCRIPT_EXT="start stop mount umount"
+SCRIPT_EXT="conf start stop mount umount"
 CONF_DIR=/etc/vz/conf
 
 # FUNCTIONS
@@ -146,12 +148,16 @@ else
     cleanup 1 "VEID private fs must be mounted to determine its size"
 fi
 
-# Before we begin writing, remove old backup dirs until we have room
+# Before we begin writing, remove old backup dirs until we have room.
+# Assume backups for any VE are fair game for removal if space is needed.
+# Other disk contents shall not be removed.
 dstblks=$(df -P "$EXTFS" | grep "$EXTFS" | awk '{ print $4 }')
 while [ $dstblks -le $srcblks ]; do
     info "Only $dstblks free on $EXTFS"
-    oldest=$(cd $EXTFS && eval ls -td "ve${VEID}*" 2>/dev/null | tail -1)
-    if [ -d "$EXTFS/$oldest" ]; then
+    oldest=$(cd $EXTFS && eval ls -td "ve[0-9]*" 2>/dev/null | tail -1)
+    if [ -z "$oldest" ]; then
+      cleanup 1 "out of space: need $srcblks KB, have $dstblks KB"
+    elif [ -d "$EXTFS/$oldest" ]; then
 	info "Removing old backup $oldest from $EXTFS"
 	rm -rf "$EXTFS/$oldest"
     else