X-Git-Url: https://git.stderr.nl/gitweb?a=blobdiff_plain;f=handlers%2Frdiff.in;h=0f934299edd0ebc86fea6dfa286079bad4906f91;hb=a7be6f20885ec089d5c1ada02947c32822a80bd0;hp=62c5a2803a10eab6a0b2fe96e6220aa6c8188257;hpb=30a91335da393b9dfc962289f1257a9578e0faab;p=matthijs%2Fupstream%2Fbackupninja-vserver.git diff --git a/handlers/rdiff.in b/handlers/rdiff.in index 62c5a28..0f93429 100644 --- a/handlers/rdiff.in +++ b/handlers/rdiff.in @@ -77,6 +77,7 @@ getconf options getconf testconnect yes getconf nicelevel 0 getconf bwlimit +getconf ignore_version no setsection source getconf type; sourcetype=$type @@ -100,6 +101,10 @@ getconf host; desthost=$host getconf sshoptions check_consistency "destination" "$type" "$user" "$host" +if [ -n "$sshoptions" ] && echo $options | grep -qv "remote-schema"; then + options="$options --remote-schema 'ssh -C $sshoptions %s rdiff-backup --server'" +fi + ### CHECK CONFIG ### # If vservers are configured, check that the ones listed in $vsnames do exist. @@ -127,7 +132,7 @@ if [ "$testconnect" = "yes" ] || [ "${test}" -eq 1 ]; then test_connection $destuser $desthost fi -if [ $ignore_version != "yes" ]; then +if [ "$ignore_version" != "yes" ]; then # see that rdiff-backup has the same version at the source and destination sourceversion=`get_version $sourceuser $sourcehost` destversion=`get_version $destuser $desthost`