X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=handlers%2Fdup;h=e490aa533e239fef24f4879e10efc8ec980b1306;hb=e12521be73b7b67c884277ad5339977c49ef7f0b;hp=6918702634d3d87a734aad1335e1d2ec2e16f3b3;hpb=51d938cd68c7a2eeaca73de9e14c6c34efceca88;p=matthijs%2Fupstream%2Fbackupninja.git

diff --git a/handlers/dup b/handlers/dup
index 6918702..e490aa5 100644
--- a/handlers/dup
+++ b/handlers/dup
@@ -51,7 +51,6 @@ if [ $vservers_are_available = yes ]; then
    fi
 else
    [ -z "$vsinclude" ] || warning 'vservers support disabled in backupninja.conf, vsincludes configuration lines will be ignored'
-   [ -z "$vsnames" ] || warning 'vservers support disabled in backupninja.conf, vsnames configuration line will be ignored'   
 fi
 
 ### see if we can login ###
@@ -119,12 +118,14 @@ set -o noglob
 # excludes
 for i in $exclude; do
 	str="${i//__star__/*}"
+	i=`readlink -f ${i#}`
 	execstr="${execstr}--exclude '$str' "
 done
 	
 # includes 
 for i in $include; do
 	str="${i//__star__/*}"
+	i=`readlink -f ${i#}`
 	execstr="${execstr}--include '$str' "
 done
 
@@ -132,7 +133,8 @@ done
 if [ $usevserver = yes ]; then
     for vserver in $vsnames; do
 	for vi in $vsinclude; do
-	    str="${vi//__star__/*}"
+	    i=`readlink -f $VROOTDIR/$vserver$vi`
+	    str="${i//__star__/*}"
 	    execstr="${execstr}--include '$VROOTDIR/$vserver$str' "
 	done
     done