diff options
author | Sergey Poznyakoff <gray@gnu.org.ua> | 2012-06-14 14:41:40 +0300 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2012-06-14 14:41:40 +0300 |
commit | 95f7d987676f9f98785563ac98b45214e8733fbf (patch) | |
tree | 04a2378946d3b901436344c5d57d07cb501d4eb6 | |
parent | d11455328e80473be4b5d225305b49a0f53f459c (diff) | |
download | beam-95f7d987676f9f98785563ac98b45214e8733fbf.tar.gz beam-95f7d987676f9f98785563ac98b45214e8733fbf.tar.bz2 |
Bugfixes.
* doc/beam-restore.1in: Fix typo.
* doc/beam.conf.5in: Fix section number in TH.
Document changes to mysql module.
* lib/beam/mysql.sh: Empty database name means dump
all databases.
* lib/beam/s3.sh (s3_mount): Fix a typo.
-rw-r--r-- | doc/beam-restore.1in | 2 | ||||
-rw-r--r-- | doc/beam.conf.5in | 2 | ||||
-rwxr-xr-x[-rw-r--r--] | lib/beam/mysql.sh | 10 | ||||
-rw-r--r-- | lib/beam/s3.sh | 2 |
4 files changed, 9 insertions, 7 deletions
diff --git a/doc/beam-restore.1in b/doc/beam-restore.1in index 348462a..4d52656 100644 --- a/doc/beam-restore.1in +++ b/doc/beam-restore.1in @@ -85,7 +85,7 @@ List archive files, instead of extracting from them. .TP \fB\-l\fR, \fB\-\-logfile\fR \fIFILE\fB Log to \fIFILE\fR instead of the standard error. This option implies -\fB\-\-confirm\R. Note also, that due to its specific nature +\fB\-\-confirm\fR. Note also, that due to its specific nature .B restore ignores the \fBbackup_logfile\fR configuration setting. .TP diff --git a/doc/beam.conf.5in b/doc/beam.conf.5in index 10e47e8..e76dd14 100644 --- a/doc/beam.conf.5in +++ b/doc/beam.conf.5in @@ -14,7 +14,7 @@ .\" You should have received a copy of the GNU General Public License .\" along with BEAM. If not, see <http://www.gnu.org/licenses/>. .\" -.TH BEAM.CONF 1 "May 16, 2012" "BEAM" "BEAM User Reference" +.TH BEAM.CONF 5 "Jun 14, 2012" "BEAM" "BEAM User Reference" .SH NAME beam.conf \- configuration file for .B backup becomes easy diff --git a/lib/beam/mysql.sh b/lib/beam/mysql.sh index a99c4fc..106ecf9 100644..100755 --- a/lib/beam/mysql.sh +++ b/lib/beam/mysql.sh @@ -17,8 +17,6 @@ # mysql_check item mysql_check() { - eval database=\$${1}_database - test -z "$database" && error "${1}_database not set" && return 1 return 0 } @@ -28,13 +26,17 @@ mysql_backup() { logit "backing up MySQL database $1" eval database=\$${1}_database - test -z "$database" && abend 1 "${1}_database not set" cmd="mysqldump" eval defaults_file=\$${1}_defaults_file if [ -n "$defaults_file" ]; then cmd="$cmd --defaults-file=$defaults_file" fi - cmd="$cmd --add-drop-database --databases" + cmd="$cmd --add-drop-database" + if test -z "$database"; then + cmd="$cmd --all-databases" + else + cmd="$cmd --databases" + fi if [ -z "$dry_run" ]; then $cmd $database > $backup_snapshot_dir/$1-$week-$round-$level else diff --git a/lib/beam/s3.sh b/lib/beam/s3.sh index bb7296f..194e035 100644 --- a/lib/beam/s3.sh +++ b/lib/beam/s3.sh @@ -47,7 +47,7 @@ umount_list="" s3_mount() { # Make sure both mountpoints exist test -d $backup_mp_s3backer || mkdir $backup_mp_s3backer - test -d $backup_mp_s3 || mkdir $backup_mp_s3backer + test -d $backup_mp_s3 || mkdir $backup_mp_s3 # Sample mount output, split into several lines: # http://finox-backup-fs.s3.amazonaws.com/ on /mnt/s3backer type fuse.s3backer |