Mirrors/backupninja
1
0
Fork 0
mirror of https://0xacab.org/liberate/backupninja.git synced 2024-11-09 20:32:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

Fix reliance on bash for pipefail. (Closes: #602374)

Browse Source 
Thanks to Sergio Talens-Oliag <sto@debian.org> for the bug report and patch.
This commit is contained in:
intrigeri 2010-11-07 13:07:26 +01:00
parent 0b60b58153
commit 13f247afeb
5 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AUTHORS
View File

@ -37,3 +37,4 @@ Chris Nolan <chris@cenolan.com> -- maildir subdirectory expansion
Dan Carley -- mysql bugfix
Jordi Mallach <jordi@debian.org> -- do not error when no jobs are configured
Jacob Anawalt <jlanawalt@gmail.com> -- pg_dump format option
Sergio Talens-Oliag <sto@debian.org> -- pipefail fixes

7
ChangeLog
View File

@ -8,10 +8,17 @@ version 0.9.9 -- UNRELEASED
(Closes Roundup bug #598)
. Remove support for duplicity < 0.4.4. Even etch-backports has
a newer one.
ldap:
. Fix reliance on bash for pipefail.
mysql:
. Fix reliance on bash for pipefail.
Thanks to Sergio Talens-Oliag <sto@debian.org> for the patch.
(Closes: #602374)
postgresql:
. Support various pg_dump formats in addition to pg_dumpall.
Thanks to Jacob Anawalt <jlanawalt@gmail.com> for the patch.
(Closes Roundup bug #2534)
. Fix reliance on bash for pipefail.
rdiff:
. Support reading include/exclude patterns from files using the
"include @/etc/backup_includes" syntax (Closes Roundup bug

2
handlers/ldap.in
View File

@ -91,7 +91,7 @@ if [ "$ldif" == "yes" ]; then
execstr="$execstr > $dumpdir/$dbsuffix.ldif"
fi
debug "$execstr"
output=`su root -c "set -o pipefail ; $execstr" 2>&1`
output=`su root -s /bin/bash -c "set -o pipefail ; $execstr" 2>&1`
code=$?
if [ "$code" == "0" ]; then
debug $output

2
handlers/mysql.in
View File

@ -303,7 +303,7 @@ then
debug "su $user -c \"$execstr\""
if [ ! $test ]
then
output=`su $user -c "set -o pipefail ; $execstr" 2>&1`
output=`su $user -s /bin/bash -c "set -o pipefail ; $execstr" 2>&1`
code=$?
if [ "$code" == "0" ]
then

12
handlers/pgsql.in
View File

@ -115,13 +115,13 @@ fi
if [ "$databases" == "all" ]; then
if [ $usevserver = yes ]; then
if [ "$compress" == "yes" ]; then
execstr="$VSERVER $vsname exec su - $PGSQLUSER -c \"set -o pipefail ; $PGSQLDUMPALL | $GZIP $GZIP_OPTS > '$backupdir/${vsname}.sql.gz'\""
execstr="$VSERVER $vsname exec su - $PGSQLUSER -s /bin/bash -c \"set -o pipefail ; $PGSQLDUMPALL | $GZIP $GZIP_OPTS > '$backupdir/${vsname}.sql.gz'\""
else
execstr="$VSERVER $vsname exec su - $PGSQLUSER -c \"$PGSQLDUMPALL > '$backupdir/${vsname}.sql'\""
fi
else
if [ "$compress" == "yes" ]; then
execstr="su - $PGSQLUSER -c \"set -o pipefail ; $PGSQLDUMPALL | $GZIP $GZIP_OPTS > '$backupdir/${localhost}-all.sql.gz'\""
execstr="su - $PGSQLUSER -s /bin/bash -c \"set -o pipefail ; $PGSQLDUMPALL | $GZIP $GZIP_OPTS > '$backupdir/${localhost}-all.sql.gz'\""
else
execstr="su - $PGSQLUSER -c \"$PGSQLDUMPALL > '$backupdir/${localhost}-all.sql'\""
fi
@ -152,9 +152,9 @@ else
globalscmd="$PGSQLDUMPALL -g > '$backupdir/globals.sql'"
fi
if [ $usevserver = yes ]; then
execstr="$VSERVER $vsname exec su - $PGSQLUSER -c \"$globalscmd\""
execstr="$VSERVER $vsname exec su - $PGSQLUSER -s /bin/bash -c \"$globalscmd\""
else
execstr="su - $PGSQLUSER -c \"$globalscmd\""
execstr="su - $PGSQLUSER -s /bin/bash -c \"$globalscmd\""
fi
debug "$execstr"
if [ ! $test ]; then
@ -189,9 +189,9 @@ else
dumpcmd="$PGSQLDUMP --format=$format ${disablecustomcompress} $db | > '$backupdir/${db}.${dumpext}'"
fi
if [ $usevserver = yes ]; then
execstr="$VSERVER $vsname exec su - $PGSQLUSER -c \"$dumpcmd\""
execstr="$VSERVER $vsname exec su - $PGSQLUSER -s /bin/bash -c \"$dumpcmd\""
else
execstr="su - $PGSQLUSER -c \"$dumpcmd\""
execstr="su - $PGSQLUSER -s /bin/bash -c \"$dumpcmd\""
fi
debug "$execstr"
if [ ! $test ]; then