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