greatly improved the rdiff wizard. added default option to menu in easydialog.

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

diff --git a/handlers/rdiff b/handlers/rdiff
index ca97fa4da760d51447617236d0a713623d6b0ed4..bec59ff69a8ff065be9a5ad1ab264650d7292ba3 100644 (file)
--- a/handlers/rdiff
+++ b/handlers/rdiff
@@ -26,7 +26,7 @@ getconf user; destuser=$user
 getconf host; desthost=$host
 
 # See if vservers are configured
-if [ "$VSERVERS" = "yes" ]
+if [ "$vservers" = "yes" ]
 then
        if [ ! -d $VROOTDIR ]
        then
@@ -43,8 +43,8 @@ if [ "$desttype" == "remote" ]; then
        # see if we can login
        if [ "$testconnect" == "yes" ]; then
                hostalive=0
-           debug "ssh -o PasswordAuthentication=no $desthost -l $destuser 'echo -n 1'"
-               ret=`ssh -o PasswordAuthentication=no $desthost -l $destuser 'echo -n host is alive'`
+           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'`
                if echo $ret | grep "host is alive"; then
                        debug "Connected to $desthost as $destuser successfully"
                else
@@ -52,8 +52,8 @@ if [ "$desttype" == "remote" ]; then
                fi
        fi
        # see that rdiff-backup has the same version as here
-       debug "ssh $desthost -l $destuser '$RDIFFBACKUP -V'\""
-       remoteversion=`ssh $desthost -l $destuser "$RDIFFBACKUP -V | grep rdiff-backup"`
+       debug "ssh -o PreferredAuthentications=publickey $desthost -l $destuser '$RDIFFBACKUP -V'\""
+       remoteversion=`ssh -o PreferredAuthentications=publickey $desthost -l $destuser "$RDIFFBACKUP -V | grep rdiff-backup"`
        localversion=`$RDIFFBACKUP -V`
        if [ "$remoteversion" != "$localversion" ]; then
                fatal "rdiff-backup does not have the same version on this computer and the backup server."