projects
/
matthijs
/
upstream
/
backupninja-vserver.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Changelog completing with proper Closes: Debian bug
[matthijs/upstream/backupninja-vserver.git]
/
handlers
/
rdiff
diff --git
a/handlers/rdiff
b/handlers/rdiff
index a80b2c53c4f2fabe787c592a3e76e6ae6fdb68d5..bdc1cbd25ddc7eb3b4916eea96794bfd57873db1 100644
(file)
--- a/
handlers/rdiff
+++ b/
handlers/rdiff
@@
-17,8
+17,8
@@
function test_connection() {
fi
local user=$1
local host=$2
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
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
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
}
fi
}
@@
-89,6
+89,7
@@
destdir=${destdir%/}
getconf type; desttype=$type
getconf user; destuser=$user
getconf host; desthost=$host
getconf type; desttype=$type
getconf user; destuser=$user
getconf host; desthost=$host
+getconf sshoptions
check_consistency "destination" "$type" "$user" "$host"
### CHECK CONFIG ###
check_consistency "destination" "$type" "$user" "$host"
### CHECK CONFIG ###
@@
-112,6
+113,7
@@
else
fi
# check the connection at the source and destination
fi
# check the connection at the source and destination
+[ -n "$test" ] || test=0
if [ "$testconnect" = "yes" ] || [ "${test}" -eq 1 ]; then
test_connection $sourceuser $sourcehost
test_connection $destuser $desthost
if [ "$testconnect" = "yes" ] || [ "${test}" -eq 1 ]; then
test_connection $sourceuser $sourcehost
test_connection $destuser $desthost
@@
-147,15
+149,15
@@
if [ "`echo $keep | tr -d 0-9`" == "" ]; then
keep="${keep}D"
fi
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 [ "$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 [ $? = 0 ]; then
debug $output
info "Removing backups older than $keep days succeeded."
@@
-171,28
+173,32
@@
execstr="$RDIFFBACKUP $options --print-statistics "
set -o noglob
set -o noglob
+symlinks_warning="Maybe you have mixed symlinks and '*' in this statement, which is not supported."
+
# TODO: order the includes and excludes
# excludes
for i in $exclude; do
# TODO: order the includes and excludes
# excludes
for i in $exclude; do
- str="${i//__star__/*}"
- i=`readlink -f ${i#}`
- execstr="${execstr}--exclude '$str' "
+ str="${i//__star__/*}"
+ execstr="${execstr}--exclude '$str' "
done
# includes
for i in $include; do
done
# includes
for i in $include; do
- [ "$i" != "/" ] || fatal "Sorry, you cannot use 'include = /'"
- str="${i//__star__/*}"
- i=`readlink -f $i`
- execstr="${execstr}--include '$str' "
+ [ "$i" != "/" ] || fatal "Sorry, you cannot use 'include = /'"
+ str="${i//__star__/*}"
+ execstr="${execstr}--include '$str' "
done
# vsinclude
if [ $usevserver = yes ]; then
for vserver in $vsnames; do
for vi in $vsinclude; do
done
# vsinclude
if [ $usevserver = yes ]; then
for vserver in $vsnames; do
for vi in $vsinclude; do
- i=`readlink -f $VROOTDIR/$vserver$vi`
- str="${i//__star__/*}"
- execstr="${execstr}--include '$str' "
+ str="${vi//__star__/*}"
+ str="$VROOTDIR/$vserver$str"
+ if [ -n "$str" ]; then
+ execstr="${execstr}--include '$str' "
+ else
+ warning "vsinclude statement '${vi//__star__/*}' will be ignored for VServer $vserver. $symlinks_warning"
+ fi
done
done
fi
done
done
fi
@@
-206,7
+212,7
@@
execstr="${execstr}--exclude '/*' "
execstr="${execstr}$execstr_sourcepart $execstr_destpart"
debug "$execstr"
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
output=`nice -n $nicelevel su -c "$execstr" 2>&1`
if [ $? = 0 ]; then
debug $output