From 1e5844fb1251d4398a388a0bb507b8ca7504a649 Mon Sep 17 00:00:00 2001 From: Dan Langille Date: Mon, 20 Sep 2004 12:54:43 +0000 Subject: [PATCH] See http://bugs.bacula.org/bug_view_advanced_page.php?bug_id=0000103 Alter src/cats/make_catalog_backup.in so it does need incoming parameters to do its job correctly. Different options are needed for different database tools. e.g. '-u bacula' for MySQL, versus '-U bacula' for PostgreSQL. At the same time, remove the parameters passed to this script in src/dird/bacula-dir.conf.in git-svn-id: https://bacula.svn.sourceforge.net/svnroot/bacula/trunk@1600 91ce42f0-d328-0410-95d8-f526ca767f89 --- bacula/src/cats/make_catalog_backup.in | 6 +++--- bacula/src/dird/bacula-dir.conf.in | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/bacula/src/cats/make_catalog_backup.in b/bacula/src/cats/make_catalog_backup.in index 61cb4b6d1d..dbc4d59435 100755 --- a/bacula/src/cats/make_catalog_backup.in +++ b/bacula/src/cats/make_catalog_backup.in @@ -6,12 +6,12 @@ cd @working_dir@ rm -f bacula.sql if test xsqlite = x@DB_NAME@ ; then - echo ".dump" | @SQL_BINDIR@/sqlite $* bacula.db >bacula.sql + echo ".dump" | @SQL_BINDIR@/sqlite bacula.db >bacula.sql else if test xmysql = x@DB_NAME@ ; then - @SQL_BINDIR@/mysqldump $* -f --opt bacula >bacula.sql + @SQL_BINDIR@/mysqldump -u bacula -f --opt bacula >bacula.sql else - @SQL_BINDIR@/pg_dump $* bacula >bacula.sql + @SQL_BINDIR@/pg_dump -U bacula bacula >bacula.sql fi fi # diff --git a/bacula/src/dird/bacula-dir.conf.in b/bacula/src/dird/bacula-dir.conf.in index cc7058323d..bc06479231 100644 --- a/bacula/src/dird/bacula-dir.conf.in +++ b/bacula/src/dird/bacula-dir.conf.in @@ -54,7 +54,7 @@ Job { FileSet="Catalog" Schedule = "WeeklyCycleAfterBackup" # This creates an ASCII copy of the catalog - RunBeforeJob = "@scriptdir@/make_catalog_backup -u bacula" + RunBeforeJob = "@scriptdir@/make_catalog_backup" # This deletes the copy of the catalog RunAfterJob = "@scriptdir@/delete_catalog_backup" Write Bootstrap = "@working_dir@/BackupCatalog.bsr" -- 2.39.5