michael@20: Index: manpages/Makefile.in michael@579: diff -Nau manpages/Makefile.in.orig manpages/Makefile.in michael@577: --- manpages/Makefile.in.orig 2010-08-05 16:29:51.000000000 +0200 michael@578: +++ manpages/Makefile.in 2010-12-19 19:30:06.000000000 +0100 michael@578: @@ -21,23 +21,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@579: diff -Nau scripts/bacula.in.orig scripts/bacula.in michael@577: --- scripts/bacula.in.orig 2010-08-05 16:29:51.000000000 +0200 michael@578: +++ scripts/bacula.in 2010-12-19 19:30:06.000000000 +0100 michael@649: @@ -14,36 +14,43 @@ michael@579: # environment where they are different. michael@579: # michael@649: SCRIPTDIR=@scriptdir@ michael@649: -# michael@649: + michael@579: # Disable Glibc malloc checks, it doesn't help and it keeps from getting michael@579: # good dumps michael@649: +# michael@220: MALLOC_CHECK_=0 michael@220: export MALLOC_CHECK_ michael@20: michael@579: -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@579: + michael@579: +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@579: + [ "$enable_sd" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-sd ] && ${SCRIPTDIR}/bacula-ctl-sd $1 $2 michael@579: + [ "$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@579: + [ "$enable_sd" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-sd ] && ${SCRIPTDIR}/bacula-ctl-sd $1 $2 michael@579: + [ "$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@579: + $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@579: + [ "$enable_sd" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-sd ] && ${SCRIPTDIR}/bacula-ctl-sd status michael@579: + [ "$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: src/dird/bacula-dir.conf.in michael@579: diff -Nau src/dird/bacula-dir.conf.in.orig src/dird/bacula-dir.conf.in michael@577: --- src/dird/bacula-dir.conf.in.orig 2010-08-05 16:29:51.000000000 +0200 michael@578: +++ src/dird/bacula-dir.conf.in 2010-12-19 19:30:06.000000000 +0100 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@578: Pool = File michael@579: @@ -106,7 +107,7 @@ michael@579: # directory to give a reasonable FileSet to backup to michael@579: # disk storage during initial testing. michael@579: # michael@579: - File = @sbindir@ michael@579: + File = @scriptdir@ michael@579: } michael@579: michael@579: # michael@578: @@ -123,6 +124,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,