X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=handlers%2Frdiff;h=4871d4e17d91102ea40c6f3e323eeb3d75ae6d86;hb=cf0e2ac5d5efba9bbc2efc79901467fd94cf3f15;hp=1a2e1ebb37eaacfea7b5c88d4e0de3b74d6b0b0b;hpb=e431f13bcc7136b1b45837475adb1f23bdeda38b;p=matthijs%2Fupstream%2Fbackupninja.git

diff --git a/handlers/rdiff b/handlers/rdiff
index 1a2e1eb..4871d4e 100644
--- a/handlers/rdiff
+++ b/handlers/rdiff
@@ -78,6 +78,7 @@ check_consistency "source" "$type" "$user" "$host"
 getconf label
 getconf keep 60
 getconf include
+getconf vsnames all
 getconf vsinclude
 getconf exclude
 
@@ -92,11 +93,22 @@ check_consistency "destination" "$type" "$user" "$host"
 
 ### CHECK CONFIG ###
 
-# See if vservers are configured
+# If vservers are configured, check that the ones listed in $vsnames do exist.
 local usevserver=no
-if [ $vservers_are_available = yes -a -n "$vsinclude" ]; then
-   info "vserver method enabled"
-   usevserver=yes
+if [ $vservers_are_available = yes ]; then
+   if [ "$vsnames" = all ]; then
+      vsnames="$found_vservers"
+   else
+      if ! vservers_exist "$vsnames" ; then
+            fatal "At least one of the vservers listed in vsnames ($vsnames) does not exist."
+      fi
+   fi
+   if [ -n "$vsinclude" ]; then
+      info "Using vservers '$vsnames'"
+      usevserver=yes
+   fi
+else
+   [ -z "$vsinclude" ] || warning 'vservers support disabled in backupninja.conf, vsincludes configuration lines will be ignored'
 fi
 
 # check the connection at the source and destination
@@ -114,7 +126,6 @@ fi
 
 # source specific checks
 [ "$include" != "" -o "$vsinclude" != "" ] || fatal "No source includes specified"
-#TODO should I test for vsinclude if usevservers=yes?
 case $sourcetype in 
 	remote ) execstr_sourcepart="$sourceuser@$sourcehost::/" ;;
 	local  ) execstr_sourcepart="/" ;;
@@ -158,14 +169,16 @@ fi
 
 execstr="$RDIFFBACKUP $options --print-statistics "
 
+set -o noglob
+
 # TODO: order the includes and excludes
 # excludes
-for i in "$exclude"; do
+for i in $exclude; do
 	str="${i//__star__/*}"
 	execstr="${execstr}--exclude '$str' "
 done
 # includes 
-for i in "$include"; do
+for i in $include; do
 	[ "$i" != "/" ] || fatal "Sorry, you cannot use 'include = /'"
 	str="${i//__star__/*}"
 	execstr="${execstr}--include '$str' "
@@ -173,14 +186,16 @@ done
 
 # vsinclude
 if [ $usevserver = yes ]; then
-	for vserver in `ls $VROOTDIR|grep -v lost+found`; do
-		for vi in "$vsinclude"; do
-			str="${vi//__star__/*}"
-			execstr="${execstr}--include '$VROOTDIR/$vserver$str' "
-		done
-	done
+   for vserver in $vsnames; do
+      for vi in $vsinclude; do
+	 str="${vi//__star__/*}"
+	 execstr="${execstr}--include '$VROOTDIR/$vserver$str' "
+      done
+   done
 fi
 
+set +o noglob
+
 # exclude everything else
 execstr="${execstr}--exclude '/*' "