1.1 --- a/bacula/bacula.patch Tue Aug 28 18:36:30 2012 +0200
1.2 +++ b/bacula/bacula.patch Tue Aug 28 18:36:35 2012 +0200
1.3 @@ -1,4 +1,5 @@
1.4 Index: manpages/Makefile.in
1.5 +diff -Nau manpages/Makefile.in.orig manpages/Makefile.in
1.6 --- manpages/Makefile.in.orig 2010-08-05 16:29:51.000000000 +0200
1.7 +++ manpages/Makefile.in 2010-12-19 19:30:06.000000000 +0100
1.8 @@ -21,23 +21,21 @@
1.9 @@ -32,25 +33,35 @@
1.10
1.11 clean:
1.12 Index: scripts/bacula.in
1.13 +diff -Nau scripts/bacula.in.orig scripts/bacula.in
1.14 --- scripts/bacula.in.orig 2010-08-05 16:29:51.000000000 +0200
1.15 +++ scripts/bacula.in 2010-12-19 19:30:06.000000000 +0100
1.16 -@@ -20,30 +20,36 @@
1.17 +@@ -13,37 +13,43 @@
1.18 + # easier to "steal" this code for the development
1.19 + # environment where they are different.
1.20 + #
1.21 +-SCRIPTDIR=@scriptdir@
1.22 ++SCRIPTDIR=@libexecdir@
1.23 + #
1.24 + # Disable Glibc malloc checks, it doesn't help and it keeps from getting
1.25 + # good dumps
1.26 MALLOC_CHECK_=0
1.27 export MALLOC_CHECK_
1.28
1.29 +-case "$1" in
1.30 +action=$1
1.31 +debug=$2
1.32 +[ -n "$3" ] && enable_dir=$3 || enable_dir=yes
1.33 +[ -n "$4" ] && enable_sd=$4 || enable_sd=yes
1.34 +[ -n "$5" ] && enable_fd=$5 || enable_fd=yes
1.35 -+
1.36 - case "$1" in
1.37 ++
1.38 ++case "$action" in
1.39 start)
1.40 - [ -x ${SCRIPTDIR}/bacula-ctl-sd ] && ${SCRIPTDIR}/bacula-ctl-sd $1 $2
1.41 - [ -x ${SCRIPTDIR}/bacula-ctl-fd ] && ${SCRIPTDIR}/bacula-ctl-fd $1 $2
1.42 - [ -x ${SCRIPTDIR}/bacula-ctl-dir ] && ${SCRIPTDIR}/bacula-ctl-dir $1 $2
1.43 -+ [ "$enable_sd" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-sd ] && ${SCRIPTDIR}/bacula-ctl-sd $1 $2
1.44 -+ [ "$enable_fd" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-fd ] && ${SCRIPTDIR}/bacula-ctl-fd $1 $2
1.45 ++ [ "$enable_sd" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-sd ] && ${SCRIPTDIR}/bacula-ctl-sd $1 $2
1.46 ++ [ "$enable_fd" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-fd ] && ${SCRIPTDIR}/bacula-ctl-fd $1 $2
1.47 + [ "$enable_dir" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-dir ] && ${SCRIPTDIR}/bacula-ctl-dir $1 $2
1.48 ;;
1.49
1.50 @@ -59,14 +70,14 @@
1.51 - [ -x ${SCRIPTDIR}/bacula-ctl-fd ] && ${SCRIPTDIR}/bacula-ctl-fd $1 $2
1.52 - [ -x ${SCRIPTDIR}/bacula-ctl-sd ] && ${SCRIPTDIR}/bacula-ctl-sd $1 $2
1.53 - [ -x ${SCRIPTDIR}/bacula-ctl-dir ] && ${SCRIPTDIR}/bacula-ctl-dir $1 $2
1.54 -+ [ "$enable_fd" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-fd ] && ${SCRIPTDIR}/bacula-ctl-fd $1 $2
1.55 -+ [ "$enable_sd" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-sd ] && ${SCRIPTDIR}/bacula-ctl-sd $1 $2
1.56 ++ [ "$enable_sd" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-sd ] && ${SCRIPTDIR}/bacula-ctl-sd $1 $2
1.57 ++ [ "$enable_fd" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-fd ] && ${SCRIPTDIR}/bacula-ctl-fd $1 $2
1.58 + [ "$enable_dir" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-dir ] && ${SCRIPTDIR}/bacula-ctl-dir $1 $2
1.59 ;;
1.60
1.61 restart)
1.62 - $0 stop
1.63 -+ $0 stop $debug $enable_dir $enable_sd $enable_fd
1.64 ++ $0 stop $debug $enable_dir $enable_sd $enable_fd
1.65 sleep 2
1.66 - $0 start
1.67 + $0 start $debug $enable_dir $enable_sd $enable_fd
1.68 @@ -76,16 +87,16 @@
1.69 - [ -x ${SCRIPTDIR}/bacula-ctl-sd ] && ${SCRIPTDIR}/bacula-ctl-sd status
1.70 - [ -x ${SCRIPTDIR}/bacula-ctl-fd ] && ${SCRIPTDIR}/bacula-ctl-fd status
1.71 - [ -x ${SCRIPTDIR}/bacula-ctl-dir ] && ${SCRIPTDIR}/bacula-ctl-dir status
1.72 -+ [ "$enable_sd" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-sd ] && ${SCRIPTDIR}/bacula-ctl-sd status
1.73 -+ [ "$enable_fd" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-fd ] && ${SCRIPTDIR}/bacula-ctl-fd status
1.74 ++ [ "$enable_sd" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-sd ] && ${SCRIPTDIR}/bacula-ctl-sd status
1.75 ++ [ "$enable_fd" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-fd ] && ${SCRIPTDIR}/bacula-ctl-fd status
1.76 + [ "$enable_dir" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-dir ] && ${SCRIPTDIR}/bacula-ctl-dir status
1.77 ;;
1.78
1.79 *)
1.80 Index: src/dird/bacula-dir.conf.in
1.81 +diff -Nau src/dird/bacula-dir.conf.in.orig src/dird/bacula-dir.conf.in
1.82 --- src/dird/bacula-dir.conf.in.orig 2010-08-05 16:29:51.000000000 +0200
1.83 +++ src/dird/bacula-dir.conf.in 2010-12-19 19:30:06.000000000 +0100
1.84 -@@ -29,7 +29,8 @@
1.85 Level = Incremental
1.86 Client = @basename@-fd
1.87 FileSet = "Full Set"
1.88 @@ -95,6 +106,15 @@
1.89 Storage = File
1.90 Messages = Standard
1.91 Pool = File
1.92 +@@ -106,7 +107,7 @@
1.93 + # directory to give a reasonable FileSet to backup to
1.94 + # disk storage during initial testing.
1.95 + #
1.96 +- File = @sbindir@
1.97 ++ File = @scriptdir@
1.98 + }
1.99 +
1.100 + #
1.101 @@ -123,6 +124,11 @@
1.102 }
1.103 }
