diff options
| author | intrigeri <intrigeri@boum.org> | 2006-01-19 21:57:02 +0000 |
|---|---|---|
| committer | intrigeri <intrigeri@boum.org> | 2006-01-19 21:57:02 +0000 |
| commit | 22bea56d9e8bf5c4645a628fe8e9f08f8b29e675 (patch) | |
| tree | 6b6c6855f5f44243ee71374fbf3a6a413f7f6ac9 | |
| parent | 299a53073483adce34c3d6a3c931f506af83b18e (diff) | |
| download | backupninja-22bea56d9e8bf5c4645a628fe8e9f08f8b29e675.tar.gz backupninja-22bea56d9e8bf5c4645a628fe8e9f08f8b29e675.tar.bz2 | |
rdiff: start to take advantage of new lib/vserver functionality
| -rw-r--r-- | handlers/rdiff | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/handlers/rdiff b/handlers/rdiff index 209606d..e2ab5e8 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__/*}" |