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 /lib | |
| 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.
Diffstat (limited to 'lib')
| -rwxr-xr-x[-rw-r--r--] | lib/beam/mysql.sh | 10 | ||||
| -rw-r--r-- | lib/beam/s3.sh | 2 |
2 files changed, 7 insertions, 5 deletions
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 |