diff -r c6c9e9bf76fd -r 8adc5213fd55 bacula/bacula.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/bacula/bacula.patch Wed Jan 07 00:25:41 2009 +0100 @@ -0,0 +1,131 @@ +Index: manpages/Makefile.in +--- manpages/Makefile.in.orig 2007-04-24 17:47:01 +0200 ++++ manpages/Makefile.in 2008-07-09 07:45:59 +0200 +@@ -20,23 +20,21 @@ + install: + $(MKDIR) $(DESTDIR)/$(mandir)/man8 + for I in ${MAN8}; \ +- do ($(RMF) $$I.gz; gzip -c $$I >$$I.gz; \ +- $(INSTALL_DATA) $$I.gz $(DESTDIR)$(mandir)/man8/$$I.gz; \ +- rm -f $$I.gz); \ ++ do \ ++ $(INSTALL_DATA) $$I $(DESTDIR)$(mandir)/man8/$$I; \ + done + $(MKDIR) $(DESTDIR)/$(mandir)/man1 + for I in ${MAN1}; \ +- do ($(RMF) $$I.gz; gzip -c $$I >$$I.gz; \ +- $(INSTALL_DATA) $$I.gz $(DESTDIR)$(mandir)/man1/$$I.gz; \ +- rm -f $$I.gz); \ ++ do \ ++ $(INSTALL_DATA) $$I $(DESTDIR)$(mandir)/man1/$$I; \ + done + + uninstall: + for I in ${MAN8}; \ +- do (rm -f $(DESTDIR)$(mandir)/man8/$$I.gz); \ ++ do (rm -f $(DESTDIR)$(mandir)/man8/$$I); \ + done + for I in ${MAN1}; \ +- do (rm -f $(DESTDIR)$(mandir)/man1/$$I.gz); \ ++ do (rm -f $(DESTDIR)$(mandir)/man1/$$I); \ + done + + clean: dummy +Index: scripts/bacula.in +--- scripts/bacula.in.orig 2008-07-06 15:06:15 +0200 ++++ scripts/bacula.in 2008-07-09 07:53:22 +0200 +@@ -15,30 +15,36 @@ + # + SCRIPTDIR=@scriptdir@ + ++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 "$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_dir" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-dir ] && ${SCRIPTDIR}/bacula-ctl-dir $1 $2 + ;; + + stop) + # Stop the FD first so that SD will fail jobs and update catalog +- [ -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_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 + sleep 2 +- $0 start ++ $0 start $debug $enable_dir $enable_sd $enable_fd + ;; + + status) +- [ -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_dir" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-dir ] && ${SCRIPTDIR}/bacula-ctl-dir status + ;; + + *) +Index: scripts/btraceback.in +--- scripts/btraceback.in.orig 2008-06-01 10:49:00 +0200 ++++ scripts/btraceback.in 2008-07-09 07:45:59 +0200 +@@ -12,6 +12,9 @@ + PNAME="${PNAME} on `hostname`" + if test `uname -s` = SunOS ; then + gcore -o @working_dir@/${PNAME} $2 ++fi ++if test `uname -s` = SunOS && ++ test -n `which dbx 2>/dev/null` ; then + dbx $1 $2 <@scriptdir@/btraceback.dbx 2>&1 \ + | @sbindir@/bsmtp -h @smtp_host@ -f @dump_email@ -s "Bacula DBX traceback of ${PNAME}" @dump_email@ + else +Index: src/dird/bacula-dir.conf.in +--- src/dird/bacula-dir.conf.in.orig 2008-06-19 21:44:34 +0200 ++++ src/dird/bacula-dir.conf.in 2008-07-09 07:45:59 +0200 +@@ -29,7 +29,8 @@ + Level = Incremental + Client = @hostname@-fd + FileSet = "Full Set" +- Schedule = "WeeklyCycle" ++ #Schedule = "WeeklyCycle" ++ 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 = @BUILD_DIR@ ++ File = @scriptdir@ + } + + # +@@ -124,6 +125,11 @@ + } + } + ++# This schedule can be used to disable automatic scheduling ++Schedule { ++ Name = NEVER ++} ++ + # + # When to do the backups, full backup on first sunday of the month, + # differential (i.e. incremental since full) every other sunday,