diff options
| author | Micah Anderson <micah@riseup.net> | 2007-12-12 02:54:09 +0000 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2007-12-12 02:54:09 +0000 |
| commit | 18f6031a726c4e2e96049c8ca4f1fc3b5dcc7c00 (patch) | |
| tree | 2eb8b8bbb3272ab4fb954547c34d248db1b1ffce | |
| parent | c0140aea9722188f761e6d2d8820f2f72bf4fc58 (diff) | |
| download | backupninja-18f6031a726c4e2e96049c8ca4f1fc3b5dcc7c00.tar.gz backupninja-18f6031a726c4e2e96049c8ca4f1fc3b5dcc7c00.tar.bz2 | |
rdiff: incorporate sshoptions into options via remote-schema if not there
| -rw-r--r-- | ChangeLog | 2 | ||||
| -rw-r--r-- | handlers/rdiff.in | 4 |
2 files changed, 6 insertions, 0 deletions
@@ -4,6 +4,8 @@ version 0.9.6 -- unreleased handler changes rdiff: . Fixed ignore_version default value missing + . Add patch from Matthew Palmer to rdiff handler to incorporate sshoptions + into options via remote-schema not already specified (Closes: #424639) wget: . New handler from rhatto designed to incrementally pull content from a website to a local folder, based on the rsync handler diff --git a/handlers/rdiff.in b/handlers/rdiff.in index bb704c5..0f93429 100644 --- a/handlers/rdiff.in +++ b/handlers/rdiff.in @@ -101,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. |