rdiff: start to take advantage of new lib/vserver functionality

git-svn-id: http://code.autistici.org/svn/backupninja/trunk@327 758a04ac-41e6-0310-8a23-8373a73cc35d

diff --git a/handlers/rdiff b/handlers/rdiff
index 209606d71de6f22d2445f746ad1e1344f6efe43e..e2ab5e8ac9dabfedd3fea44951a2f99977423d58 100644 (file)
--- a/handlers/rdiff
+++ b/handlers/rdiff
@@ -93,15 +93,10 @@ check_consistency "destination" "$type" "$user" "$host"
 ### CHECK CONFIG ###
 
 # See if vservers are configured
-if [ "$vservers" = "yes" ]
-then
-       if [ ! -d $VROOTDIR ]
-       then
-               fatal "vservers enabled, but $VROOTDIR does not exist!"
-       else
-               info "vserver method enabled"
-               usevserver=1
-       fi
+local usevserver=no
+if [ $vservers_are_available = yes ]; then
+   info "vserver method enabled"
+   usevserver=yes
 fi
 
 # check the connection at the source and destination
@@ -119,7 +114,7 @@ fi
 
 # source specific checks
 [ "$include" != "" -o "$vsinclude" != "" ] || fatal "No source includes specified"
-#TODO should I test for vsinclude if usevservers=1?
+#TODO should I test for vsinclude if usevservers=yes?
 case $sourcetype in 
        remote ) execstr_sourcepart="$sourceuser@$sourcehost::/" ;;
        local  ) execstr_sourcepart="/" ;;
@@ -177,7 +172,7 @@ for i in $include; do
 done
 
 # vsinclude
-if [ $usevserver ]; then
+if [ $usevserver = yes ]; then
        for vserver in `ls $VROOTDIR|grep -v lost+found`; do
                for vi in $vsinclude; do
                        str="${vi//__star__/*}"