X-Git-Url: https://git.stderr.nl/gitweb?p=matthijs%2Fupstream%2Fbackupninja.git;a=blobdiff_plain;f=handlers%2Frdiff;h=e2ab5e8ac9dabfedd3fea44951a2f99977423d58;hp=9de8650e1a289414d659bddc9036b1b9a36ec7b5;hb=22bea56d9e8bf5c4645a628fe8e9f08f8b29e675;hpb=a116f435ce8b97fdbea9fd25f91517b1fb850881

diff --git a/handlers/rdiff b/handlers/rdiff
index 9de8650..e2ab5e8 100644
--- a/handlers/rdiff
+++ b/handlers/rdiff
@@ -1,3 +1,4 @@
+# -*- mode: sh; sh-basic-offset: 3; indent-tabs-mode: nil; -*-
 #
 # rdiff-backup handler script for backupninja
 # requires rdiff-backup
@@ -92,19 +93,14 @@ 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
-if [ "$testconnect" == "yes" -o $test ]; then
+if [ "$testconnect" = "yes" ] || [ "${test}" -eq 1 ]; then
 	test_connection $sourceuser $sourcehost
 	test_connection $destuser $desthost
 fi
@@ -118,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="/" ;;
@@ -176,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__/*}"