comparison: bacula/bacula.patch
bacula/bacula.patch
- changeset 141
- e41fe78aeff0
- parent 20
- 8adc5213fd55
- child 142
- c960abd3fd97
equal
deleted
inserted
replaced
| 0:4f577304b689 | 1:ac4a79dab7e8 |
|---|---|
| 1 Index: manpages/Makefile.in | 1 Index: manpages/Makefile.in |
| 2 --- manpages/Makefile.in.orig 2007-04-24 17:47:01 +0200 | 2 diff -Nau manpages/Makefile.in.orig manpages/Makefile.in |
| 3 +++ manpages/Makefile.in 2008-07-09 07:45:59 +0200 | 3 --- manpages/Makefile.in.orig 2007-04-24 17:47:01.000000000 +0200 |
| 4 +++ manpages/Makefile.in 2008-11-19 22:55:01.066689027 +0100 | |
| 4 @@ -20,23 +20,21 @@ | 5 @@ -20,23 +20,21 @@ |
| 5 install: | 6 install: |
| 6 $(MKDIR) $(DESTDIR)/$(mandir)/man8 | 7 $(MKDIR) $(DESTDIR)/$(mandir)/man8 |
| 7 for I in ${MAN8}; \ | 8 for I in ${MAN8}; \ |
| 8 - do ($(RMF) $$I.gz; gzip -c $$I >$$I.gz; \ | 9 - do ($(RMF) $$I.gz; gzip -c $$I >$$I.gz; \ |
| 30 + do (rm -f $(DESTDIR)$(mandir)/man1/$$I); \ | 31 + do (rm -f $(DESTDIR)$(mandir)/man1/$$I); \ |
| 31 done | 32 done |
| 32 | 33 |
| 33 clean: dummy | 34 clean: dummy |
| 34 Index: scripts/bacula.in | 35 Index: scripts/bacula.in |
| 35 --- scripts/bacula.in.orig 2008-07-06 15:06:15 +0200 | 36 diff -Nau scripts/bacula.in.orig scripts/bacula.in |
| 36 +++ scripts/bacula.in 2008-07-09 07:53:22 +0200 | 37 --- scripts/bacula.in.orig 2008-07-06 15:06:15.000000000 +0200 |
| 37 @@ -15,30 +15,36 @@ | 38 +++ scripts/bacula.in 2008-11-19 23:08:15.438347068 +0100 |
| 39 @@ -13,32 +13,38 @@ | |
| 40 # easier to "steal" this code for the development | |
| 41 # environment where they are different. | |
| 38 # | 42 # |
| 39 SCRIPTDIR=@scriptdir@ | 43 -SCRIPTDIR=@scriptdir@ |
| 44 +SCRIPTDIR=@libexecdir@ | |
| 40 | 45 |
| 46 -case "$1" in | |
| 41 +action=$1 | 47 +action=$1 |
| 42 +debug=$2 | 48 +debug=$2 |
| 43 +[ -n "$3" ] && enable_dir=$3 || enable_dir=yes | 49 +[ -n "$3" ] && enable_dir=$3 || enable_dir=yes |
| 44 +[ -n "$4" ] && enable_sd=$4 || enable_sd=yes | 50 +[ -n "$4" ] && enable_sd=$4 || enable_sd=yes |
| 45 +[ -n "$5" ] && enable_fd=$5 || enable_fd=yes | 51 +[ -n "$5" ] && enable_fd=$5 || enable_fd=yes |
| 46 + | 52 + |
| 47 case "$1" in | 53 +case "$action" in |
| 48 start) | 54 start) |
| 49 - [ -x ${SCRIPTDIR}/bacula-ctl-sd ] && ${SCRIPTDIR}/bacula-ctl-sd $1 $2 | 55 - [ -x ${SCRIPTDIR}/bacula-ctl-sd ] && ${SCRIPTDIR}/bacula-ctl-sd $1 $2 |
| 50 - [ -x ${SCRIPTDIR}/bacula-ctl-fd ] && ${SCRIPTDIR}/bacula-ctl-fd $1 $2 | 56 - [ -x ${SCRIPTDIR}/bacula-ctl-fd ] && ${SCRIPTDIR}/bacula-ctl-fd $1 $2 |
| 51 - [ -x ${SCRIPTDIR}/bacula-ctl-dir ] && ${SCRIPTDIR}/bacula-ctl-dir $1 $2 | 57 - [ -x ${SCRIPTDIR}/bacula-ctl-dir ] && ${SCRIPTDIR}/bacula-ctl-dir $1 $2 |
| 52 + [ "$enable_sd" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-sd ] && ${SCRIPTDIR}/bacula-ctl-sd $1 $2 | 58 + [ "$enable_sd" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-sd ] && ${SCRIPTDIR}/bacula-ctl-sd $1 $2 |
| 53 + [ "$enable_fd" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-fd ] && ${SCRIPTDIR}/bacula-ctl-fd $1 $2 | 59 + [ "$enable_fd" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-fd ] && ${SCRIPTDIR}/bacula-ctl-fd $1 $2 |
| 54 + [ "$enable_dir" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-dir ] && ${SCRIPTDIR}/bacula-ctl-dir $1 $2 | 60 + [ "$enable_dir" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-dir ] && ${SCRIPTDIR}/bacula-ctl-dir $1 $2 |
| 55 ;; | 61 ;; |
| 56 | 62 |
| 57 stop) | 63 stop) |
| 58 # Stop the FD first so that SD will fail jobs and update catalog | 64 # Stop the FD first so that SD will fail jobs and update catalog |
| 59 - [ -x ${SCRIPTDIR}/bacula-ctl-fd ] && ${SCRIPTDIR}/bacula-ctl-fd $1 $2 | 65 - [ -x ${SCRIPTDIR}/bacula-ctl-fd ] && ${SCRIPTDIR}/bacula-ctl-fd $1 $2 |
| 60 - [ -x ${SCRIPTDIR}/bacula-ctl-sd ] && ${SCRIPTDIR}/bacula-ctl-sd $1 $2 | 66 - [ -x ${SCRIPTDIR}/bacula-ctl-sd ] && ${SCRIPTDIR}/bacula-ctl-sd $1 $2 |
| 61 - [ -x ${SCRIPTDIR}/bacula-ctl-dir ] && ${SCRIPTDIR}/bacula-ctl-dir $1 $2 | 67 - [ -x ${SCRIPTDIR}/bacula-ctl-dir ] && ${SCRIPTDIR}/bacula-ctl-dir $1 $2 |
| 62 + [ "$enable_fd" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-fd ] && ${SCRIPTDIR}/bacula-ctl-fd $1 $2 | 68 + [ "$enable_sd" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-sd ] && ${SCRIPTDIR}/bacula-ctl-sd $1 $2 |
| 63 + [ "$enable_sd" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-sd ] && ${SCRIPTDIR}/bacula-ctl-sd $1 $2 | 69 + [ "$enable_fd" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-fd ] && ${SCRIPTDIR}/bacula-ctl-fd $1 $2 |
| 64 + [ "$enable_dir" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-dir ] && ${SCRIPTDIR}/bacula-ctl-dir $1 $2 | 70 + [ "$enable_dir" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-dir ] && ${SCRIPTDIR}/bacula-ctl-dir $1 $2 |
| 65 ;; | 71 ;; |
| 66 | 72 |
| 67 restart) | 73 restart) |
| 68 - $0 stop | 74 - $0 stop |
| 74 | 80 |
| 75 status) | 81 status) |
| 76 - [ -x ${SCRIPTDIR}/bacula-ctl-sd ] && ${SCRIPTDIR}/bacula-ctl-sd status | 82 - [ -x ${SCRIPTDIR}/bacula-ctl-sd ] && ${SCRIPTDIR}/bacula-ctl-sd status |
| 77 - [ -x ${SCRIPTDIR}/bacula-ctl-fd ] && ${SCRIPTDIR}/bacula-ctl-fd status | 83 - [ -x ${SCRIPTDIR}/bacula-ctl-fd ] && ${SCRIPTDIR}/bacula-ctl-fd status |
| 78 - [ -x ${SCRIPTDIR}/bacula-ctl-dir ] && ${SCRIPTDIR}/bacula-ctl-dir status | 84 - [ -x ${SCRIPTDIR}/bacula-ctl-dir ] && ${SCRIPTDIR}/bacula-ctl-dir status |
| 79 + [ "$enable_sd" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-sd ] && ${SCRIPTDIR}/bacula-ctl-sd status | 85 + [ "$enable_sd" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-sd ] && ${SCRIPTDIR}/bacula-ctl-sd status |
| 80 + [ "$enable_fd" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-fd ] && ${SCRIPTDIR}/bacula-ctl-fd status | 86 + [ "$enable_fd" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-fd ] && ${SCRIPTDIR}/bacula-ctl-fd status |
| 81 + [ "$enable_dir" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-dir ] && ${SCRIPTDIR}/bacula-ctl-dir status | 87 + [ "$enable_dir" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-dir ] && ${SCRIPTDIR}/bacula-ctl-dir status |
| 82 ;; | 88 ;; |
| 83 | 89 |
| 84 *) | 90 *) |
| 85 Index: scripts/btraceback.in | 91 Index: scripts/btraceback.in |
| 86 --- scripts/btraceback.in.orig 2008-06-01 10:49:00 +0200 | 92 diff -Nau scripts/btraceback.in.orig scripts/btraceback.in |
| 87 +++ scripts/btraceback.in 2008-07-09 07:45:59 +0200 | 93 --- scripts/btraceback.in.orig 2008-06-01 10:49:00.000000000 +0200 |
| 94 +++ scripts/btraceback.in 2008-11-19 23:09:44.305993544 +0100 | |
| 88 @@ -12,6 +12,9 @@ | 95 @@ -12,6 +12,9 @@ |
| 89 PNAME="${PNAME} on `hostname`" | 96 PNAME="${PNAME} on `hostname`" |
| 90 if test `uname -s` = SunOS ; then | 97 if test `uname -s` = SunOS ; then |
| 91 gcore -o @working_dir@/${PNAME} $2 | 98 gcore -o @working_dir@/${PNAME} $2 |
| 92 +fi | 99 +fi |
| 94 + test -n `which dbx 2>/dev/null` ; then | 101 + test -n `which dbx 2>/dev/null` ; then |
| 95 dbx $1 $2 <@scriptdir@/btraceback.dbx 2>&1 \ | 102 dbx $1 $2 <@scriptdir@/btraceback.dbx 2>&1 \ |
| 96 | @sbindir@/bsmtp -h @smtp_host@ -f @dump_email@ -s "Bacula DBX traceback of ${PNAME}" @dump_email@ | 103 | @sbindir@/bsmtp -h @smtp_host@ -f @dump_email@ -s "Bacula DBX traceback of ${PNAME}" @dump_email@ |
| 97 else | 104 else |
| 98 Index: src/dird/bacula-dir.conf.in | 105 Index: src/dird/bacula-dir.conf.in |
| 99 --- src/dird/bacula-dir.conf.in.orig 2008-06-19 21:44:34 +0200 | 106 diff -Nau src/dird/bacula-dir.conf.in.orig src/dird/bacula-dir.conf.in |
| 100 +++ src/dird/bacula-dir.conf.in 2008-07-09 07:45:59 +0200 | 107 --- src/dird/bacula-dir.conf.in.orig 2008-06-19 21:44:34.000000000 +0200 |
| 108 +++ src/dird/bacula-dir.conf.in 2008-11-19 23:10:11.001069502 +0100 | |
| 101 @@ -29,7 +29,8 @@ | 109 @@ -29,7 +29,8 @@ |
| 102 Level = Incremental | 110 Level = Incremental |
| 103 Client = @hostname@-fd | 111 Client = @hostname@-fd |
| 104 FileSet = "Full Set" | 112 FileSet = "Full Set" |
| 105 - Schedule = "WeeklyCycle" | 113 - Schedule = "WeeklyCycle" |
