Mirrors/backupninja
1
0
Fork 0
mirror of https://0xacab.org/liberate/backupninja.git synced 2024-09-20 07:31:41 +02:00
Code Issues Packages Projects Releases Wiki Activity

Solve quoting issue with "su" (debian #683731) (upstream #4019)

Browse Source 
A fix for debian #677410 on commit 29dcdbae introduces a new issue on wheezy
machines where some rsync_options gets out of the rsync command quotes when
invoked by su.

As reported, running backupninja through `bash -x` shows that the `--delete`
option from the rsync command is not included in the single quote for the `su
-c` command:

    nice -n 0 su -c '/usr/bin/rsync -av' --delete '--recursive
    --delete-excluded    //home/ /tmp/test//home//'

This patch attempt to solve that issue by using the intermediary variable
$command.
This commit is contained in:
Silvio Rhatto 2013-04-20 12:07:27 -03:00
parent 0cb6fcd647
commit b8b8b46fba
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
handlers/rsync.in
View File

@ -1136,9 +1136,10 @@ for SECTION in $include; do
set_dest
info "Syncing $SECTION on $dest_path..."
debug $nice $rsync ${rsync_options[@]} $filelist_flag $excludes $batch_option $orig $dest_path
command="$rsync ${rsync_options[@]} --delete-excluded $filelist_flag $excludes $batch_option $orig $dest_path"
debug $nice su -c "$command"
set_pipefail
$nice su -c "$rsync ${rsync_options[@]} --delete-excluded $filelist_flag $excludes $batch_option $orig $dest_path" | tee -a $log
$nice su -c "$command" | tee -a $log
check_rsync_exit_status $?
restore_pipefail