From 22bea56d9e8bf5c4645a628fe8e9f08f8b29e675 Mon Sep 17 00:00:00 2001
From: intrigeri <intrigeri@boum.org>
Date: Thu, 19 Jan 2006 21:57:02 +0000
Subject: [PATCH] rdiff: start to take advantage of new lib/vserver
functionality
---
handlers/rdiff | 17 ++++++-----------
1 file changed, 6 insertions(+), 11 deletions(-)
diff --git a/handlers/rdiff b/handlers/rdiff
index 209606d7..e2ab5e8a 100644
--- 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__/*}"
--
GitLab