1.1 --- a/bacula/bacula.patch Sat Oct 03 16:15:32 2009 +0200
1.2 +++ b/bacula/bacula.patch Sat Oct 03 16:18:52 2009 +0200
1.3 @@ -31,17 +31,22 @@
1.4 + do (rm -f $(DESTDIR)$(mandir)/man1/$$I); \
1.5 done
1.6
1.7 - clean: dummy
1.8 + clean:
1.9 Index: scripts/bacula.in
1.10 diff -Nau scripts/bacula.in.orig scripts/bacula.in
1.11 ---- scripts/bacula.in.orig 2008-07-06 15:06:15.000000000 +0200
1.12 -+++ scripts/bacula.in 2008-11-19 23:08:15.438347068 +0100
1.13 -@@ -13,32 +13,38 @@
1.14 +--- scripts/bacula.in.orig 2008-07-24 17:02:06.000000000 +0200
1.15 ++++ scripts/bacula.in 2009-09-17 00:40:53.423969596 +0200
1.16 +@@ -13,37 +13,43 @@
1.17 # easier to "steal" this code for the development
1.18 # environment where they are different.
1.19 #
1.20 -SCRIPTDIR=@scriptdir@
1.21 +SCRIPTDIR=@libexecdir@
1.22 + #
1.23 + # Disable Glibc malloc checks, it doesn't help and it keeps from getting
1.24 + # good dumps
1.25 + MALLOC_CHECK_=0
1.26 + export MALLOC_CHECK_
1.27
1.28 -case "$1" in
1.29 +action=$1
1.30 @@ -65,8 +70,8 @@
1.31 - [ -x ${SCRIPTDIR}/bacula-ctl-fd ] && ${SCRIPTDIR}/bacula-ctl-fd $1 $2
1.32 - [ -x ${SCRIPTDIR}/bacula-ctl-sd ] && ${SCRIPTDIR}/bacula-ctl-sd $1 $2
1.33 - [ -x ${SCRIPTDIR}/bacula-ctl-dir ] && ${SCRIPTDIR}/bacula-ctl-dir $1 $2
1.34 ++ [ "$enable_sd" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-sd ] && ${SCRIPTDIR}/bacula-ctl-sd $1 $2
1.35 + [ "$enable_fd" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-fd ] && ${SCRIPTDIR}/bacula-ctl-fd $1 $2
1.36 -+ [ "$enable_sd" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-sd ] && ${SCRIPTDIR}/bacula-ctl-sd $1 $2
1.37 + [ "$enable_dir" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-dir ] && ${SCRIPTDIR}/bacula-ctl-dir $1 $2
1.38 ;;
1.39
1.40 @@ -104,11 +109,11 @@
1.41 | @sbindir@/bsmtp -h @smtp_host@ -f @dump_email@ -s "Bacula DBX traceback of ${PNAME}" @dump_email@
1.42 Index: src/dird/bacula-dir.conf.in
1.43 diff -Nau src/dird/bacula-dir.conf.in.orig src/dird/bacula-dir.conf.in
1.44 ---- src/dird/bacula-dir.conf.in.orig 2008-06-19 21:44:34.000000000 +0200
1.45 -+++ src/dird/bacula-dir.conf.in 2008-11-19 23:10:11.001069502 +0100
1.46 +--- src/dird/bacula-dir.conf.in.orig 2009-07-15 19:05:40.000000000 +0200
1.47 ++++ src/dird/bacula-dir.conf.in 2009-09-17 00:45:04.055970595 +0200
1.48 @@ -29,7 +29,8 @@
1.49 Level = Incremental
1.50 - Client = @hostname@-fd
1.51 + Client = @basename@-fd
1.52 FileSet = "Full Set"
1.53 - Schedule = "WeeklyCycle"
1.54 + #Schedule = "WeeklyCycle"
1.55 @@ -120,12 +125,12 @@
1.56 # directory to give a reasonable FileSet to backup to
1.57 # disk storage during initial testing.
1.58 #
1.59 -- File = @BUILD_DIR@
1.60 +- File = @sbindir@
1.61 + File = @scriptdir@
1.62 }
1.63
1.64 #
1.65 -@@ -124,6 +125,11 @@
1.66 +@@ -126,6 +127,11 @@
1.67 }
1.68 }
1.69
