If you include= or exclude= a directory that is actually a symlink

[matthijs/upstream/backupninja.git] / handlers / rdiff

diff --git a/handlers/rdiff b/handlers/rdiff
index e2ab5e8ac9dabfedd3fea44951a2f99977423d58..6cbe6faf48ba8cc3a9a2687ede8931185a30af93 100644 (file)
--- 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 ]; then
-   info "vserver method enabled"
-   usevserver=yes
+   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,29 +169,36 @@ fi
 
 execstr="$RDIFFBACKUP $options --print-statistics "
 
+set -o noglob
+
 # TODO: order the includes and excludes
 # excludes
 for i in $exclude; do
+       i=`readlink -f $i`
        str="${i//__star__/*}"
        execstr="${execstr}--exclude '$str' "
 done
 # includes 
 for i in $include; do
        [ "$i" != "/" ] || fatal "Sorry, you cannot use 'include = /'"
+       i=`readlink -f $i`
        str="${i//__star__/*}"
        execstr="${execstr}--include '$str' "
 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
+        i=`readlink -f $VROOTDIR/$vserver$vi`
+        str="${i//__star__/*}"
+        execstr="${execstr}--include '$VROOTDIR/$vserver$str' "
+      done
+   done
 fi
 
+set +o noglob
+
 # exclude everything else
 execstr="${execstr}--exclude '/*' "