kes Cancel storage daemon in all cases where FD reports error. This

[bacula/bacula] / bacula / src / cats / make_catalog_backup.in.patch

diff --git a/bacula/src/cats/make_catalog_backup.in.patch b/bacula/src/cats/make_catalog_backup.in.patch
index ae4e765b47500d18a048b4b2ae56294bf2d4e07d..7279dc005b5e1bf49e4c6a77bdd08f2be6a5f802 100644 (file)
--- a/bacula/src/cats/make_catalog_backup.in.patch
+++ b/bacula/src/cats/make_catalog_backup.in.patch
@@ -1,29 +1,20 @@
---- make_catalog_backup.in     2006-08-05 10:05:11.000000000 -0400
-+++ make_catalog_backup.in.fixed       2006-08-05 10:11:53.000000000 -0400
-@@ -14,7 +14,7 @@
+--- make_catalog_backup.in      2006-12-09 10:17:05.000000000 -0500
++++ make_catalog_backup.in.fixed        2006-12-09 10:24:40.000000000 -0500
+@@ -16,7 +16,7 @@
  cd @working_dir@
  rm -f bacula.sql
- if test xsqlite = x@DB_NAME@ ; then
--  echo ".dump" | @SQL_BINDIR@/sqlite $1.db >$1.sql
+ if test xsqlite = x@DB_TYPE@ ; then
+-  echo ".dump" | ${BINDIR}/sqlite $1.db >$1.sql
 +  echo ".dump" | /usr/lib/bacula/sqlite/sqlite $1.db >$1.sql
  else
-   if test xmysql = x@DB_NAME@ ; then
+   if test xmysql = x@DB_TYPE@ ; then
      if test $# -gt 2; then
-@@ -31,7 +31,7 @@
+@@ -33,7 +33,7 @@
        fi
-       exec @SQL_BINDIR@/pg_dump -U $2 $1 >$1.sql
+       exec ${BINDIR}/pg_dump -c -U $2 $1 >$1.sql
      else
--      echo ".dump" | @SQL_BINDIR@/sqlite3 $1.db >$1.sql
+-      echo ".dump" | ${BINDIR}/sqlite3 $1.db >$1.sql
 +      echo ".dump" | /usr/lib/bacula/sqlite/sqlite3 $1.db >$1.sql
      fi
    fi
  fi
-@@ -44,7 +44,7 @@
- #  To read back a SQLite database use:
- #     cd @working_dir@
- #     rm -f bacula.db
--#     sqlite bacula.db <bacula.sql
-+#     /usr/lib/bacula/sqlite/sqlite bacula.db <bacula.sql
- #
- #  To read back a PostgreSQL database use:
- #     cd @working_dir@