Fixed/improved a few bits of rdiff, dup and sys handlers.

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

diff --git a/handlers/rdiff b/handlers/rdiff
index bec59ff69a8ff065be9a5ad1ab264650d7292ba3..10cb3c06d7523b4cf4cf219d4e64a1f9e782298d 100644 (file)
--- a/handlers/rdiff
+++ b/handlers/rdiff
@@ -43,8 +43,8 @@ if [ "$desttype" == "remote" ]; then
        # see if we can login
        if [ "$testconnect" == "yes" ]; then
                hostalive=0
-           debug "ssh -o -o PreferredAuthentications=publickey $desthost -l $destuser 'echo -n 1'"
-               ret=`ssh -o -o PreferredAuthentications=publickey $desthost -l $destuser 'echo -n host is alive'`
+           debug "ssh -o PreferredAuthentications=publickey $desthost -l $destuser 'echo -n 1'"
+               ret=`ssh -o PreferredAuthentications=publickey $desthost -l $destuser 'echo -n host is alive'`
                if echo $ret | grep "host is alive"; then
                        debug "Connected to $desthost as $destuser successfully"
                else
@@ -118,7 +118,7 @@ done
 # vsinclude
 if [ $usevserver ] 
 then
-       for vserver in `ls $VROOTDIR|grep -v lost+found`
+       for vserver in `ls $VROOTDIR | grep -E -v "lost+found|ARCHIVES"`
        do
                for vi in $vsinclude
                do