bacula/bacula.patch@8adc5213fd55 (annotated)
bacula/bacula.patch
Wed, 07 Jan 2009 00:25:41 +0100
- author
- Michael Schloh von Bennewitz <michael@schloh.com>
- date
- Wed, 07 Jan 2009 00:25:41 +0100
- changeset 20
- 8adc5213fd55
- child 21
- 5ba5c2911c12
- permissions
- -rw-r--r--
Import package vendor original specs for necessary manipulations.
| michael@20 | 1 | Index: manpages/Makefile.in |
| michael@20 | 2 | --- manpages/Makefile.in.orig 2007-04-24 17:47:01 +0200 |
| michael@20 | 3 | +++ manpages/Makefile.in 2008-07-09 07:45:59 +0200 |
| michael@20 | 4 | @@ -20,23 +20,21 @@ |
| michael@20 | 5 | install: |
| michael@20 | 6 | $(MKDIR) $(DESTDIR)/$(mandir)/man8 |
| michael@20 | 7 | for I in ${MAN8}; \ |
| michael@20 | 8 | - do ($(RMF) $$I.gz; gzip -c $$I >$$I.gz; \ |
| michael@20 | 9 | - $(INSTALL_DATA) $$I.gz $(DESTDIR)$(mandir)/man8/$$I.gz; \ |
| michael@20 | 10 | - rm -f $$I.gz); \ |
| michael@20 | 11 | + do \ |
| michael@20 | 12 | + $(INSTALL_DATA) $$I $(DESTDIR)$(mandir)/man8/$$I; \ |
| michael@20 | 13 | done |
| michael@20 | 14 | $(MKDIR) $(DESTDIR)/$(mandir)/man1 |
| michael@20 | 15 | for I in ${MAN1}; \ |
| michael@20 | 16 | - do ($(RMF) $$I.gz; gzip -c $$I >$$I.gz; \ |
| michael@20 | 17 | - $(INSTALL_DATA) $$I.gz $(DESTDIR)$(mandir)/man1/$$I.gz; \ |
| michael@20 | 18 | - rm -f $$I.gz); \ |
| michael@20 | 19 | + do \ |
| michael@20 | 20 | + $(INSTALL_DATA) $$I $(DESTDIR)$(mandir)/man1/$$I; \ |
| michael@20 | 21 | done |
| michael@20 | 22 | |
| michael@20 | 23 | uninstall: |
| michael@20 | 24 | for I in ${MAN8}; \ |
| michael@20 | 25 | - do (rm -f $(DESTDIR)$(mandir)/man8/$$I.gz); \ |
| michael@20 | 26 | + do (rm -f $(DESTDIR)$(mandir)/man8/$$I); \ |
| michael@20 | 27 | done |
| michael@20 | 28 | for I in ${MAN1}; \ |
| michael@20 | 29 | - do (rm -f $(DESTDIR)$(mandir)/man1/$$I.gz); \ |
| michael@20 | 30 | + do (rm -f $(DESTDIR)$(mandir)/man1/$$I); \ |
| michael@20 | 31 | done |
| michael@20 | 32 | |
| michael@20 | 33 | clean: dummy |
| michael@20 | 34 | Index: scripts/bacula.in |
| michael@20 | 35 | --- scripts/bacula.in.orig 2008-07-06 15:06:15 +0200 |
| michael@20 | 36 | +++ scripts/bacula.in 2008-07-09 07:53:22 +0200 |
| michael@20 | 37 | @@ -15,30 +15,36 @@ |
| michael@20 | 38 | # |
| michael@20 | 39 | SCRIPTDIR=@scriptdir@ |
| michael@20 | 40 | |
| michael@20 | 41 | +action=$1 |
| michael@20 | 42 | +debug=$2 |
| michael@20 | 43 | +[ -n "$3" ] && enable_dir=$3 || enable_dir=yes |
| michael@20 | 44 | +[ -n "$4" ] && enable_sd=$4 || enable_sd=yes |
| michael@20 | 45 | +[ -n "$5" ] && enable_fd=$5 || enable_fd=yes |
| michael@20 | 46 | + |
| michael@20 | 47 | case "$1" in |
| michael@20 | 48 | start) |
| michael@20 | 49 | - [ -x ${SCRIPTDIR}/bacula-ctl-sd ] && ${SCRIPTDIR}/bacula-ctl-sd $1 $2 |
| michael@20 | 50 | - [ -x ${SCRIPTDIR}/bacula-ctl-fd ] && ${SCRIPTDIR}/bacula-ctl-fd $1 $2 |
| michael@20 | 51 | - [ -x ${SCRIPTDIR}/bacula-ctl-dir ] && ${SCRIPTDIR}/bacula-ctl-dir $1 $2 |
| michael@20 | 52 | + [ "$enable_sd" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-sd ] && ${SCRIPTDIR}/bacula-ctl-sd $1 $2 |
| michael@20 | 53 | + [ "$enable_fd" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-fd ] && ${SCRIPTDIR}/bacula-ctl-fd $1 $2 |
| michael@20 | 54 | + [ "$enable_dir" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-dir ] && ${SCRIPTDIR}/bacula-ctl-dir $1 $2 |
| michael@20 | 55 | ;; |
| michael@20 | 56 | |
| michael@20 | 57 | stop) |
| michael@20 | 58 | # Stop the FD first so that SD will fail jobs and update catalog |
| michael@20 | 59 | - [ -x ${SCRIPTDIR}/bacula-ctl-fd ] && ${SCRIPTDIR}/bacula-ctl-fd $1 $2 |
| michael@20 | 60 | - [ -x ${SCRIPTDIR}/bacula-ctl-sd ] && ${SCRIPTDIR}/bacula-ctl-sd $1 $2 |
| michael@20 | 61 | - [ -x ${SCRIPTDIR}/bacula-ctl-dir ] && ${SCRIPTDIR}/bacula-ctl-dir $1 $2 |
| michael@20 | 62 | + [ "$enable_fd" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-fd ] && ${SCRIPTDIR}/bacula-ctl-fd $1 $2 |
| michael@20 | 63 | + [ "$enable_sd" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-sd ] && ${SCRIPTDIR}/bacula-ctl-sd $1 $2 |
| michael@20 | 64 | + [ "$enable_dir" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-dir ] && ${SCRIPTDIR}/bacula-ctl-dir $1 $2 |
| michael@20 | 65 | ;; |
| michael@20 | 66 | |
| michael@20 | 67 | restart) |
| michael@20 | 68 | - $0 stop |
| michael@20 | 69 | + $0 stop $debug $enable_dir $enable_sd $enable_fd |
| michael@20 | 70 | sleep 2 |
| michael@20 | 71 | - $0 start |
| michael@20 | 72 | + $0 start $debug $enable_dir $enable_sd $enable_fd |
| michael@20 | 73 | ;; |
| michael@20 | 74 | |
| michael@20 | 75 | status) |
| michael@20 | 76 | - [ -x ${SCRIPTDIR}/bacula-ctl-sd ] && ${SCRIPTDIR}/bacula-ctl-sd status |
| michael@20 | 77 | - [ -x ${SCRIPTDIR}/bacula-ctl-fd ] && ${SCRIPTDIR}/bacula-ctl-fd status |
| michael@20 | 78 | - [ -x ${SCRIPTDIR}/bacula-ctl-dir ] && ${SCRIPTDIR}/bacula-ctl-dir status |
| michael@20 | 79 | + [ "$enable_sd" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-sd ] && ${SCRIPTDIR}/bacula-ctl-sd status |
| michael@20 | 80 | + [ "$enable_fd" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-fd ] && ${SCRIPTDIR}/bacula-ctl-fd status |
| michael@20 | 81 | + [ "$enable_dir" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-dir ] && ${SCRIPTDIR}/bacula-ctl-dir status |
| michael@20 | 82 | ;; |
| michael@20 | 83 | |
| michael@20 | 84 | *) |
| michael@20 | 85 | Index: scripts/btraceback.in |
| michael@20 | 86 | --- scripts/btraceback.in.orig 2008-06-01 10:49:00 +0200 |
| michael@20 | 87 | +++ scripts/btraceback.in 2008-07-09 07:45:59 +0200 |
| michael@20 | 88 | @@ -12,6 +12,9 @@ |
| michael@20 | 89 | PNAME="${PNAME} on `hostname`" |
| michael@20 | 90 | if test `uname -s` = SunOS ; then |
| michael@20 | 91 | gcore -o @working_dir@/${PNAME} $2 |
| michael@20 | 92 | +fi |
| michael@20 | 93 | +if test `uname -s` = SunOS && |
| michael@20 | 94 | + test -n `which dbx 2>/dev/null` ; then |
| michael@20 | 95 | dbx $1 $2 <@scriptdir@/btraceback.dbx 2>&1 \ |
| michael@20 | 96 | | @sbindir@/bsmtp -h @smtp_host@ -f @dump_email@ -s "Bacula DBX traceback of ${PNAME}" @dump_email@ |
| michael@20 | 97 | else |
| michael@20 | 98 | Index: src/dird/bacula-dir.conf.in |
| michael@20 | 99 | --- src/dird/bacula-dir.conf.in.orig 2008-06-19 21:44:34 +0200 |
| michael@20 | 100 | +++ src/dird/bacula-dir.conf.in 2008-07-09 07:45:59 +0200 |
| michael@20 | 101 | @@ -29,7 +29,8 @@ |
| michael@20 | 102 | Level = Incremental |
| michael@20 | 103 | Client = @hostname@-fd |
| michael@20 | 104 | FileSet = "Full Set" |
| michael@20 | 105 | - Schedule = "WeeklyCycle" |
| michael@20 | 106 | + #Schedule = "WeeklyCycle" |
| michael@20 | 107 | + Schedule = "NEVER" |
| michael@20 | 108 | Storage = File |
| michael@20 | 109 | Messages = Standard |
| michael@20 | 110 | Pool = Default |
| michael@20 | 111 | @@ -109,7 +110,7 @@ |
| michael@20 | 112 | # directory to give a reasonable FileSet to backup to |
| michael@20 | 113 | # disk storage during initial testing. |
| michael@20 | 114 | # |
| michael@20 | 115 | - File = @BUILD_DIR@ |
| michael@20 | 116 | + File = @scriptdir@ |
| michael@20 | 117 | } |
| michael@20 | 118 | |
| michael@20 | 119 | # |
| michael@20 | 120 | @@ -124,6 +125,11 @@ |
| michael@20 | 121 | } |
| michael@20 | 122 | } |
| michael@20 | 123 | |
| michael@20 | 124 | +# This schedule can be used to disable automatic scheduling |
| michael@20 | 125 | +Schedule { |
| michael@20 | 126 | + Name = NEVER |
| michael@20 | 127 | +} |
| michael@20 | 128 | + |
| michael@20 | 129 | # |
| michael@20 | 130 | # When to do the backups, full backup on first sunday of the month, |
| michael@20 | 131 | # differential (i.e. incremental since full) every other sunday, |
