diff -r e3c6a8f912f4 -r ac1eb2cd38a8 bacula/bacula.patch
--- a/bacula/bacula.patch	Tue Aug 28 18:36:20 2012 +0200
+++ b/bacula/bacula.patch	Tue Aug 28 18:36:30 2012 +0200
@@ -1,8 +1,7 @@
 Index: manpages/Makefile.in
-diff -Nau manpages/Makefile.in.orig manpages/Makefile.in
 --- manpages/Makefile.in.orig	2010-08-05 16:29:51.000000000 +0200
-+++ manpages/Makefile.in	2011-05-01 17:26:43.000000000 +0200
-@@ -20,23 +20,21 @@
++++ manpages/Makefile.in	2010-12-19 19:30:06.000000000 +0100
+@@ -21,23 +21,21 @@
  install:
  	$(MKDIR) $(DESTDIR)/$(mandir)/man8
  	for I in ${MAN8}; \
@@ -33,35 +32,25 @@
  
  clean:
 Index: scripts/bacula.in
-diff -Nau scripts/bacula.in.orig scripts/bacula.in
 --- scripts/bacula.in.orig	2010-08-05 16:29:51.000000000 +0200
-+++ scripts/bacula.in	2011-05-01 17:26:43.000000000 +0200
-@@ -13,37 +13,43 @@
- #  easier to "steal" this code for the development 
- #  environment where they are different.
- #  
--SCRIPTDIR=@scriptdir@
-+SCRIPTDIR=@libexecdir@
- #
- # Disable Glibc malloc checks, it doesn't help and it keeps from getting
- #   good dumps
++++ scripts/bacula.in	2010-12-19 19:30:06.000000000 +0100
+@@ -20,30 +20,36 @@
  MALLOC_CHECK_=0
  export MALLOC_CHECK_
  
--case "$1" in
 +action=$1
 +debug=$2
 +[ -n "$3" ] && enable_dir=$3 || enable_dir=yes
 +[ -n "$4" ] && enable_sd=$4  || enable_sd=yes
 +[ -n "$5" ] && enable_fd=$5  || enable_fd=yes
-+ 
-+case "$action" in
++
+ case "$1" in
     start)
 -      [ -x ${SCRIPTDIR}/bacula-ctl-sd ] && ${SCRIPTDIR}/bacula-ctl-sd $1 $2
 -      [ -x ${SCRIPTDIR}/bacula-ctl-fd ] && ${SCRIPTDIR}/bacula-ctl-fd $1 $2
 -      [ -x ${SCRIPTDIR}/bacula-ctl-dir ] && ${SCRIPTDIR}/bacula-ctl-dir $1 $2
-+      [ "$enable_sd" = "yes"  ] && [ -x ${SCRIPTDIR}/bacula-ctl-sd ] && ${SCRIPTDIR}/bacula-ctl-sd $1 $2
-+      [ "$enable_fd" = "yes"  ] && [ -x ${SCRIPTDIR}/bacula-ctl-fd ] && ${SCRIPTDIR}/bacula-ctl-fd $1 $2
++      [ "$enable_sd" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-sd ] && ${SCRIPTDIR}/bacula-ctl-sd $1 $2
++      [ "$enable_fd" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-fd ] && ${SCRIPTDIR}/bacula-ctl-fd $1 $2
 +      [ "$enable_dir" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-dir ] && ${SCRIPTDIR}/bacula-ctl-dir $1 $2
        ;;
  
@@ -70,14 +59,14 @@
 -      [ -x ${SCRIPTDIR}/bacula-ctl-fd ] && ${SCRIPTDIR}/bacula-ctl-fd $1 $2
 -      [ -x ${SCRIPTDIR}/bacula-ctl-sd ] && ${SCRIPTDIR}/bacula-ctl-sd $1 $2
 -      [ -x ${SCRIPTDIR}/bacula-ctl-dir ] && ${SCRIPTDIR}/bacula-ctl-dir $1 $2
-+      [ "$enable_sd" = "yes"  ] && [ -x ${SCRIPTDIR}/bacula-ctl-sd ] && ${SCRIPTDIR}/bacula-ctl-sd $1 $2
-+      [ "$enable_fd" = "yes"  ] && [ -x ${SCRIPTDIR}/bacula-ctl-fd ] && ${SCRIPTDIR}/bacula-ctl-fd $1 $2
++      [ "$enable_fd" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-fd ] && ${SCRIPTDIR}/bacula-ctl-fd $1 $2
++      [ "$enable_sd" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-sd ] && ${SCRIPTDIR}/bacula-ctl-sd $1 $2
 +      [ "$enable_dir" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-dir ] && ${SCRIPTDIR}/bacula-ctl-dir $1 $2
        ;;
  
     restart)
 -      $0 stop
-+      $0 stop $debug $enable_dir $enable_sd $enable_fd
++      $0 stop  $debug $enable_dir $enable_sd $enable_fd
        sleep 2
 -      $0 start
 +      $0 start $debug $enable_dir $enable_sd $enable_fd
@@ -87,16 +76,15 @@
 -      [ -x ${SCRIPTDIR}/bacula-ctl-sd ] && ${SCRIPTDIR}/bacula-ctl-sd status
 -      [ -x ${SCRIPTDIR}/bacula-ctl-fd ] && ${SCRIPTDIR}/bacula-ctl-fd status
 -      [ -x ${SCRIPTDIR}/bacula-ctl-dir ] && ${SCRIPTDIR}/bacula-ctl-dir status
-+      [ "$enable_sd" = "yes"  ] && [ -x ${SCRIPTDIR}/bacula-ctl-sd ] && ${SCRIPTDIR}/bacula-ctl-sd status
-+      [ "$enable_fd" = "yes"  ] && [ -x ${SCRIPTDIR}/bacula-ctl-fd ] && ${SCRIPTDIR}/bacula-ctl-fd status
++      [ "$enable_sd" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-sd ] && ${SCRIPTDIR}/bacula-ctl-sd status
++      [ "$enable_fd" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-fd ] && ${SCRIPTDIR}/bacula-ctl-fd status
 +      [ "$enable_dir" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-dir ] && ${SCRIPTDIR}/bacula-ctl-dir status
        ;;
  
     *)
 Index: src/dird/bacula-dir.conf.in
-diff -Nau src/dird/bacula-dir.conf.in.orig src/dird/bacula-dir.conf.in
 --- src/dird/bacula-dir.conf.in.orig	2010-08-05 16:29:51.000000000 +0200
-+++ src/dird/bacula-dir.conf.in	2011-05-01 17:26:43.000000000 +0200
++++ src/dird/bacula-dir.conf.in	2010-12-19 19:30:06.000000000 +0100
 @@ -29,7 +29,8 @@
    Level = Incremental
    Client = @basename@-fd 
@@ -106,17 +94,8 @@
 +  Schedule = "NEVER"
    Storage = File
    Messages = Standard
-   Pool = Default
-@@ -109,7 +110,7 @@
- #    directory to give a reasonable FileSet to backup to
- #    disk storage during initial testing.
- #
--    File = @sbindir@
-+    File = @scriptdir@
-   }
- 
- #
-@@ -126,6 +127,11 @@
+   Pool = File
+@@ -123,6 +124,11 @@
    }
  }