Skip to content
Snippets Groups Projects
Commit 22bea56d authored by intrigeri's avatar intrigeri
Browse files

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

parent 299a5307
No related branches found
No related tags found
No related merge requests found
...@@ -93,15 +93,10 @@ check_consistency "destination" "$type" "$user" "$host" ...@@ -93,15 +93,10 @@ check_consistency "destination" "$type" "$user" "$host"
### CHECK CONFIG ### ### CHECK CONFIG ###
# See if vservers are configured # See if vservers are configured
if [ "$vservers" = "yes" ] local usevserver=no
then if [ $vservers_are_available = yes ]; then
if [ ! -d $VROOTDIR ] info "vserver method enabled"
then usevserver=yes
fatal "vservers enabled, but $VROOTDIR does not exist!"
else
info "vserver method enabled"
usevserver=1
fi
fi fi
# check the connection at the source and destination # check the connection at the source and destination
...@@ -119,7 +114,7 @@ fi ...@@ -119,7 +114,7 @@ fi
# source specific checks # source specific checks
[ "$include" != "" -o "$vsinclude" != "" ] || fatal "No source includes specified" [ "$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 case $sourcetype in
remote ) execstr_sourcepart="$sourceuser@$sourcehost::/" ;; remote ) execstr_sourcepart="$sourceuser@$sourcehost::/" ;;
local ) execstr_sourcepart="/" ;; local ) execstr_sourcepart="/" ;;
...@@ -177,7 +172,7 @@ for i in $include; do ...@@ -177,7 +172,7 @@ for i in $include; do
done done
# vsinclude # vsinclude
if [ $usevserver ]; then if [ $usevserver = yes ]; then
for vserver in `ls $VROOTDIR|grep -v lost+found`; do for vserver in `ls $VROOTDIR|grep -v lost+found`; do
for vi in $vsinclude; do for vi in $vsinclude; do
str="${vi//__star__/*}" str="${vi//__star__/*}"
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment