projects
/
matthijs
/
upstream
/
backupninja.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
299a530
)
rdiff: start to take advantage of new lib/vserver functionality
author
intrigeri
<intrigeri@boum.org>
Thu, 19 Jan 2006 21:57:02 +0000
(21:57 +0000)
committer
intrigeri
<intrigeri@boum.org>
Thu, 19 Jan 2006 21:57:02 +0000
(21:57 +0000)
handlers/rdiff
patch
|
blob
|
history
diff --git
a/handlers/rdiff
b/handlers/rdiff
index 209606d71de6f22d2445f746ad1e1344f6efe43e..e2ab5e8ac9dabfedd3fea44951a2f99977423d58 100644
(file)
--- a/
handlers/rdiff
+++ b/
handlers/rdiff
@@
-93,15
+93,10
@@
check_consistency "destination" "$type" "$user" "$host"
### CHECK CONFIG ###
# See if vservers are configured
### 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
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"
# 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="/" ;;
case $sourcetype in
remote ) execstr_sourcepart="$sourceuser@$sourcehost::/" ;;
local ) execstr_sourcepart="/" ;;
@@
-177,7
+172,7
@@
for i in $include; do
done
# vsinclude
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__/*}"
for vserver in `ls $VROOTDIR|grep -v lost+found`; do
for vi in $vsinclude; do
str="${vi//__star__/*}"