diff options
| author | Micah Anderson <micah@riseup.net> | 2006-10-02 00:21:24 +0000 |
|---|---|---|
| committer | Micah Anderson <micah@riseup.net> | 2006-10-02 00:21:24 +0000 |
| commit | 6d6d041bce7ddc077cb20ff0a63de4ca8b450403 (patch) | |
| tree | 60d0f392c8056d7b0e7e8e483942696a5c1bc86c /handlers/rdiff | |
| parent | a4360a23e9c2ee00a43dd76072b53c48db637911 (diff) | |
| download | backupninja-6d6d041bce7ddc077cb20ff0a63de4ca8b450403.tar.gz backupninja-6d6d041bce7ddc077cb20ff0a63de4ca8b450403.tar.bz2 | |
Added changes from rhatto
Diffstat (limited to 'handlers/rdiff')
| -rw-r--r-- | handlers/rdiff | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/handlers/rdiff b/handlers/rdiff index 8faca9d..79577c6 100644 --- a/handlers/rdiff +++ b/handlers/rdiff @@ -17,8 +17,8 @@ function test_connection() { fi local user=$1 local host=$2 - debug "ssh -o PasswordAuthentication=no $host -l $user 'echo -n 1'" - local ret=`ssh -o PasswordAuthentication=no $host -l $user 'echo -n host is alive'` + debug "ssh $sshoptions -o PasswordAuthentication=no $host -l $user 'echo -n 1'" + local ret=`ssh $sshoptions -o PasswordAuthentication=no $host -l $user 'echo -n host is alive'` if echo $ret | grep "host is alive"; then debug "Connected to $host as $user successfully" else @@ -36,8 +36,8 @@ function get_version() { else local user=$1 local host=$2 - debug "ssh $host -l $user '$RDIFFBACKUP -V'" - echo `ssh $host -l $user "$RDIFFBACKUP -V | grep rdiff-backup"` + debug "ssh $sshoptions $host -l $user '$RDIFFBACKUP -V'" + echo `ssh $sshoptions $host -l $user "$RDIFFBACKUP -V | grep rdiff-backup"` fi } @@ -89,6 +89,7 @@ destdir=${destdir%/} getconf type; desttype=$type getconf user; destuser=$user getconf host; desthost=$host +getconf sshoptions check_consistency "destination" "$type" "$user" "$host" ### CHECK CONFIG ### @@ -148,7 +149,7 @@ if [ "`echo $keep | tr -d 0-9`" == "" ]; then keep="${keep}D" fi -removestr="$RDIFFBACKUP --force --remove-older-than $keep " +removestr="$RDIFFBACKUP $options --force --remove-older-than $keep " if [ "$desttype" == "remote" ]; then removestr="${removestr}${destuser}@${desthost}::" fi @@ -156,7 +157,7 @@ removestr="${removestr}${destdir}/${label}"; debug "$removestr" if [ $test = 0 ]; then - output=`$removestr 2>&1` + output="`su -c "$removestr" 2>&1`" if [ $? = 0 ]; then debug $output info "Removing backups older than $keep days succeeded." |