From afccd091e814a49623d7644c71b3f296039bf447 Mon Sep 17 00:00:00 2001 From: smckown Date: Wed, 9 Apr 2008 16:18:49 +0000 Subject: [PATCH] Calculates sblks/dblks correctly now. --- bpcdump | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/bpcdump b/bpcdump index 3953ef9..1be18ac 100755 --- a/bpcdump +++ b/bpcdump @@ -108,7 +108,7 @@ fi # Unmount the filesystem, first getting its size if mount | grep -q "on $VEMNT"; then mounted=1 # duplicate; vzctl status told us... - srcblks=$(df "$VEMNT" | grep "VEMNT" | awk '{ print $2 }') + srcblks=$(df -P "$VEMNT" | grep "$VEMNT" | awk '{ print $2 }') # Add 5% buffer t=$((srcblks / 20)) srcblks=$((srcblks + t)) @@ -120,15 +120,15 @@ else fi # Before we begin writing, remove old backup dirs until we have room -dstblks=$(df "$EXTFS" | grep "$EXTFS" | awk '{ print $4 }') +dstblks=$(df -P "$EXTFS" | grep "$EXTFS" | awk '{ print $4 }') while [ $dstblks -le $srcblks ]; do - oldest=$(cd $EXTFS && ls -ld "ve${VEID}*" 2>/dev/null | tail -1 | \ + oldest=$(cd $EXTFS && ls -ltd "ve${VEID}*" 2>/dev/null | tail -1 | \ awk '{ print $8 }') if [ -d "$oldest" ]; then echo "Removing old backup $oldest from $EXTFS" rm -rf $oldest fi - dstblks=$(df "$EXTFS" | grep "$EXTFS" | awk '{ print $4 }') + dstblks=$(df -P "$EXTFS" | grep "$EXTFS" | awk '{ print $4 }') done if [ $dstblks -le $srcblks ]; then cleanup 1 "out of space: need $srcblks KB, have $dstblks KB" -- 2.39.2