michael@20: Index: manpages/Makefile.in
michael@21: diff -Nau manpages/Makefile.in.orig manpages/Makefile.in
michael@21: --- manpages/Makefile.in.orig	2007-04-24 17:47:01.000000000 +0200
michael@21: +++ manpages/Makefile.in	2008-11-19 22:55:01.066689027 +0100
michael@20: @@ -20,23 +20,21 @@
michael@20:  install:
michael@20:  	$(MKDIR) $(DESTDIR)/$(mandir)/man8
michael@20:  	for I in ${MAN8}; \
michael@20: -	  do ($(RMF) $$I.gz; gzip -c $$I >$$I.gz; \
michael@20: -	     $(INSTALL_DATA) $$I.gz $(DESTDIR)$(mandir)/man8/$$I.gz; \
michael@20: -	     rm -f $$I.gz); \
michael@20: +	  do \
michael@20: +	     $(INSTALL_DATA) $$I $(DESTDIR)$(mandir)/man8/$$I; \
michael@20:  	done
michael@20:  	$(MKDIR) $(DESTDIR)/$(mandir)/man1
michael@20:  	for I in ${MAN1}; \
michael@20: -	  do ($(RMF) $$I.gz; gzip -c $$I >$$I.gz; \
michael@20: -	     $(INSTALL_DATA) $$I.gz $(DESTDIR)$(mandir)/man1/$$I.gz; \
michael@20: -	     rm -f $$I.gz); \
michael@20: +	  do  \
michael@20: +	     $(INSTALL_DATA) $$I $(DESTDIR)$(mandir)/man1/$$I; \
michael@20:  	done
michael@20:  
michael@20:  uninstall:
michael@20:  	for I in ${MAN8}; \
michael@20: -	  do (rm -f $(DESTDIR)$(mandir)/man8/$$I.gz); \
michael@20: +	  do (rm -f $(DESTDIR)$(mandir)/man8/$$I); \
michael@20:  	done
michael@20:  	for I in ${MAN1}; \
michael@20: -	  do (rm -f $(DESTDIR)$(mandir)/man1/$$I.gz); \
michael@20: +	  do (rm -f $(DESTDIR)$(mandir)/man1/$$I); \
michael@20:  	done
michael@20:  
michael@220:  clean:
michael@20: Index: scripts/bacula.in
michael@21: diff -Nau scripts/bacula.in.orig scripts/bacula.in
michael@220: --- scripts/bacula.in.orig	2008-07-24 17:02:06.000000000 +0200
michael@220: +++ scripts/bacula.in	2009-09-17 00:40:53.423969596 +0200
michael@220: @@ -13,37 +13,43 @@
michael@21:  #  easier to "steal" this code for the development 
michael@21:  #  environment where they are different.
michael@20:  #  
michael@21: -SCRIPTDIR=@scriptdir@
michael@21: +SCRIPTDIR=@libexecdir@
michael@220:  #
michael@220:  # Disable Glibc malloc checks, it doesn't help and it keeps from getting
michael@220:  #   good dumps
michael@220:  MALLOC_CHECK_=0
michael@220:  export MALLOC_CHECK_
michael@20:  
michael@21: -case "$1" in
michael@20: +action=$1
michael@20: +debug=$2
michael@20: +[ -n "$3" ] && enable_dir=$3 || enable_dir=yes
michael@20: +[ -n "$4" ] && enable_sd=$4  || enable_sd=yes
michael@20: +[ -n "$5" ] && enable_fd=$5  || enable_fd=yes
michael@21: + 
michael@21: +case "$action" in
michael@20:     start)
michael@20: -      [ -x ${SCRIPTDIR}/bacula-ctl-sd ] && ${SCRIPTDIR}/bacula-ctl-sd $1 $2
michael@20: -      [ -x ${SCRIPTDIR}/bacula-ctl-fd ] && ${SCRIPTDIR}/bacula-ctl-fd $1 $2
michael@20: -      [ -x ${SCRIPTDIR}/bacula-ctl-dir ] && ${SCRIPTDIR}/bacula-ctl-dir $1 $2
michael@21: +      [ "$enable_sd" = "yes"  ] && [ -x ${SCRIPTDIR}/bacula-ctl-sd ] && ${SCRIPTDIR}/bacula-ctl-sd $1 $2
michael@21: +      [ "$enable_fd" = "yes"  ] && [ -x ${SCRIPTDIR}/bacula-ctl-fd ] && ${SCRIPTDIR}/bacula-ctl-fd $1 $2
michael@20: +      [ "$enable_dir" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-dir ] && ${SCRIPTDIR}/bacula-ctl-dir $1 $2
michael@20:        ;;
michael@20:  
michael@20:     stop)
michael@20:        # Stop the FD first so that SD will fail jobs and update catalog
michael@20: -      [ -x ${SCRIPTDIR}/bacula-ctl-fd ] && ${SCRIPTDIR}/bacula-ctl-fd $1 $2
michael@20: -      [ -x ${SCRIPTDIR}/bacula-ctl-sd ] && ${SCRIPTDIR}/bacula-ctl-sd $1 $2
michael@20: -      [ -x ${SCRIPTDIR}/bacula-ctl-dir ] && ${SCRIPTDIR}/bacula-ctl-dir $1 $2
michael@220: +      [ "$enable_sd" = "yes"  ] && [ -x ${SCRIPTDIR}/bacula-ctl-sd ] && ${SCRIPTDIR}/bacula-ctl-sd $1 $2
michael@213: +      [ "$enable_fd" = "yes"  ] && [ -x ${SCRIPTDIR}/bacula-ctl-fd ] && ${SCRIPTDIR}/bacula-ctl-fd $1 $2
michael@20: +      [ "$enable_dir" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-dir ] && ${SCRIPTDIR}/bacula-ctl-dir $1 $2
michael@20:        ;;
michael@20:  
michael@20:     restart)
michael@20: -      $0 stop
michael@213: +      $0 stop $debug $enable_dir $enable_sd $enable_fd
michael@20:        sleep 2
michael@20: -      $0 start
michael@20: +      $0 start $debug $enable_dir $enable_sd $enable_fd
michael@20:        ;;
michael@20:  
michael@20:     status)
michael@20: -      [ -x ${SCRIPTDIR}/bacula-ctl-sd ] && ${SCRIPTDIR}/bacula-ctl-sd status
michael@20: -      [ -x ${SCRIPTDIR}/bacula-ctl-fd ] && ${SCRIPTDIR}/bacula-ctl-fd status
michael@20: -      [ -x ${SCRIPTDIR}/bacula-ctl-dir ] && ${SCRIPTDIR}/bacula-ctl-dir status
michael@21: +      [ "$enable_sd" = "yes"  ] && [ -x ${SCRIPTDIR}/bacula-ctl-sd ] && ${SCRIPTDIR}/bacula-ctl-sd status
michael@21: +      [ "$enable_fd" = "yes"  ] && [ -x ${SCRIPTDIR}/bacula-ctl-fd ] && ${SCRIPTDIR}/bacula-ctl-fd status
michael@20: +      [ "$enable_dir" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-dir ] && ${SCRIPTDIR}/bacula-ctl-dir status
michael@20:        ;;
michael@20:  
michael@20:     *)
michael@20: Index: scripts/btraceback.in
michael@21: diff -Nau scripts/btraceback.in.orig scripts/btraceback.in
michael@21: --- scripts/btraceback.in.orig	2008-06-01 10:49:00.000000000 +0200
michael@21: +++ scripts/btraceback.in	2008-11-19 23:09:44.305993544 +0100
michael@142: @@ -13,6 +13,9 @@
michael@142:  WD="@working_dir@"
michael@20:  if test `uname -s` = SunOS ; then
michael@142:    gcore -o ${WD}/${PNAME} $2
michael@20: +fi
michael@20: +if test `uname -s` = SunOS &&
michael@20: +   test -n `which dbx 2>/dev/null` ; then
michael@142:    dbx $1 $2 <@scriptdir@/btraceback.dbx >${WD}/bacula.$$.traceback 2>&1
michael@142:    cat ${WD}/bacula.$$.traceback \
michael@20:     | @sbindir@/bsmtp -h @smtp_host@ -f @dump_email@ -s "Bacula DBX traceback of ${PNAME}" @dump_email@
michael@20: Index: src/dird/bacula-dir.conf.in
michael@21: diff -Nau src/dird/bacula-dir.conf.in.orig src/dird/bacula-dir.conf.in
michael@220: --- src/dird/bacula-dir.conf.in.orig	2009-07-15 19:05:40.000000000 +0200
michael@220: +++ src/dird/bacula-dir.conf.in	2009-09-17 00:45:04.055970595 +0200
michael@20: @@ -29,7 +29,8 @@
michael@20:    Level = Incremental
michael@220:    Client = @basename@-fd 
michael@20:    FileSet = "Full Set"
michael@20: -  Schedule = "WeeklyCycle"
michael@20: + #Schedule = "WeeklyCycle"
michael@20: +  Schedule = "NEVER"
michael@20:    Storage = File
michael@20:    Messages = Standard
michael@20:    Pool = Default
michael@20: @@ -109,7 +110,7 @@
michael@20:  #    directory to give a reasonable FileSet to backup to
michael@20:  #    disk storage during initial testing.
michael@20:  #
michael@220: -    File = @sbindir@
michael@20: +    File = @scriptdir@
michael@20:    }
michael@20:  
michael@20:  #
michael@220: @@ -126,6 +127,11 @@
michael@20:    }
michael@20:  }
michael@20:  
michael@20: +# This schedule can be used to disable automatic scheduling
michael@20: +Schedule {
michael@20: +  Name = NEVER
michael@20: +}
michael@20: +
michael@20:  #
michael@20:  # When to do the backups, full backup on first sunday of the month,
michael@20:  #  differential (i.e. incremental since full) every other sunday,