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
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
}
getconf type; desttype=$type
getconf user; destuser=$user
getconf host; desthost=$host
+getconf sshoptions
check_consistency "destination" "$type" "$user" "$host"
### CHECK CONFIG ###
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
removestr="${removestr}${destdir}/${label}";
debug "$removestr"
-if [ ! $test ]; then
- output=`$removestr 2>&1`
+if [ $test = 0 ]; then
+ output="`su -c "$removestr" 2>&1`"
if [ $? = 0 ]; then
debug $output
info "Removing backups older than $keep days succeeded."
if [ -n "$str" ]; then
execstr="${execstr}--exclude '$str' "
else
- warning "exclude statement ${i//__star__/*} will be ignored. $symlinks_warning"
+ warning "exclude statement '${i//__star__/*}' will be ignored. $symlinks_warning"
fi
done
# includes
if [ -n "$str" ]; then
execstr="${execstr}--include '$str' "
else
- warning "include statement ${i//__star__/*} will be ignored. $symlinks_warning"
+ warning "include statement '${i//__star__/*}' will be ignored. $symlinks_warning"
fi
done
if [ -n "$str" ]; then
execstr="${execstr}--include '$str' "
else
- warning "vsinclude statement ${vi//__star__/*} will be ignored for VServer $vserver. $symlinks_warning"
+ warning "vsinclude statement '${vi//__star__/*}' will be ignored for VServer $vserver. $symlinks_warning"
fi
done
done
execstr="${execstr}$execstr_sourcepart $execstr_destpart"
debug "$execstr"
-if [ ! $test ]; then
+if [ $test = 0 ]; then
output=`nice -n $nicelevel su -c "$execstr" 2>&1`
if [ $? = 0 ]; then
debug $output