comparison: bacula/bacula.patch
bacula/bacula.patch
- changeset 458
- 153370aaf13f
- parent 213
- 117704011216
- child 577
- e3c6a8f912f4
equal
deleted
inserted
replaced
| 3:658cbadbbcdd | 4:18f02ee25d84 |
|---|---|
| 29 for I in ${MAN1}; \ | 29 for I in ${MAN1}; \ |
| 30 - do (rm -f $(DESTDIR)$(mandir)/man1/$$I.gz); \ | 30 - do (rm -f $(DESTDIR)$(mandir)/man1/$$I.gz); \ |
| 31 + do (rm -f $(DESTDIR)$(mandir)/man1/$$I); \ | 31 + do (rm -f $(DESTDIR)$(mandir)/man1/$$I); \ |
| 32 done | 32 done |
| 33 | 33 |
| 34 clean: dummy | 34 clean: |
| 35 Index: scripts/bacula.in | 35 Index: scripts/bacula.in |
| 36 diff -Nau scripts/bacula.in.orig scripts/bacula.in | 36 diff -Nau scripts/bacula.in.orig scripts/bacula.in |
| 37 --- scripts/bacula.in.orig 2008-07-06 15:06:15.000000000 +0200 | 37 --- scripts/bacula.in.orig 2008-07-24 17:02:06.000000000 +0200 |
| 38 +++ scripts/bacula.in 2008-11-19 23:08:15.438347068 +0100 | 38 +++ scripts/bacula.in 2009-09-17 00:40:53.423969596 +0200 |
| 39 @@ -13,32 +13,38 @@ | 39 @@ -13,37 +13,43 @@ |
| 40 # easier to "steal" this code for the development | 40 # easier to "steal" this code for the development |
| 41 # environment where they are different. | 41 # environment where they are different. |
| 42 # | 42 # |
| 43 -SCRIPTDIR=@scriptdir@ | 43 -SCRIPTDIR=@scriptdir@ |
| 44 +SCRIPTDIR=@libexecdir@ | 44 +SCRIPTDIR=@libexecdir@ |
| 45 # | |
| 46 # Disable Glibc malloc checks, it doesn't help and it keeps from getting | |
| 47 # good dumps | |
| 48 MALLOC_CHECK_=0 | |
| 49 export MALLOC_CHECK_ | |
| 45 | 50 |
| 46 -case "$1" in | 51 -case "$1" in |
| 47 +action=$1 | 52 +action=$1 |
| 48 +debug=$2 | 53 +debug=$2 |
| 49 +[ -n "$3" ] && enable_dir=$3 || enable_dir=yes | 54 +[ -n "$3" ] && enable_dir=$3 || enable_dir=yes |
| 63 stop) | 68 stop) |
| 64 # Stop the FD first so that SD will fail jobs and update catalog | 69 # Stop the FD first so that SD will fail jobs and update catalog |
| 65 - [ -x ${SCRIPTDIR}/bacula-ctl-fd ] && ${SCRIPTDIR}/bacula-ctl-fd $1 $2 | 70 - [ -x ${SCRIPTDIR}/bacula-ctl-fd ] && ${SCRIPTDIR}/bacula-ctl-fd $1 $2 |
| 66 - [ -x ${SCRIPTDIR}/bacula-ctl-sd ] && ${SCRIPTDIR}/bacula-ctl-sd $1 $2 | 71 - [ -x ${SCRIPTDIR}/bacula-ctl-sd ] && ${SCRIPTDIR}/bacula-ctl-sd $1 $2 |
| 67 - [ -x ${SCRIPTDIR}/bacula-ctl-dir ] && ${SCRIPTDIR}/bacula-ctl-dir $1 $2 | 72 - [ -x ${SCRIPTDIR}/bacula-ctl-dir ] && ${SCRIPTDIR}/bacula-ctl-dir $1 $2 |
| 73 + [ "$enable_sd" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-sd ] && ${SCRIPTDIR}/bacula-ctl-sd $1 $2 | |
| 68 + [ "$enable_fd" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-fd ] && ${SCRIPTDIR}/bacula-ctl-fd $1 $2 | 74 + [ "$enable_fd" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-fd ] && ${SCRIPTDIR}/bacula-ctl-fd $1 $2 |
| 69 + [ "$enable_sd" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-sd ] && ${SCRIPTDIR}/bacula-ctl-sd $1 $2 | |
| 70 + [ "$enable_dir" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-dir ] && ${SCRIPTDIR}/bacula-ctl-dir $1 $2 | 75 + [ "$enable_dir" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-dir ] && ${SCRIPTDIR}/bacula-ctl-dir $1 $2 |
| 71 ;; | 76 ;; |
| 72 | 77 |
| 73 restart) | 78 restart) |
| 74 - $0 stop | 79 - $0 stop |
| 102 dbx $1 $2 <@scriptdir@/btraceback.dbx >${WD}/bacula.$$.traceback 2>&1 | 107 dbx $1 $2 <@scriptdir@/btraceback.dbx >${WD}/bacula.$$.traceback 2>&1 |
| 103 cat ${WD}/bacula.$$.traceback \ | 108 cat ${WD}/bacula.$$.traceback \ |
| 104 | @sbindir@/bsmtp -h @smtp_host@ -f @dump_email@ -s "Bacula DBX traceback of ${PNAME}" @dump_email@ | 109 | @sbindir@/bsmtp -h @smtp_host@ -f @dump_email@ -s "Bacula DBX traceback of ${PNAME}" @dump_email@ |
| 105 Index: src/dird/bacula-dir.conf.in | 110 Index: src/dird/bacula-dir.conf.in |
| 106 diff -Nau src/dird/bacula-dir.conf.in.orig src/dird/bacula-dir.conf.in | 111 diff -Nau src/dird/bacula-dir.conf.in.orig src/dird/bacula-dir.conf.in |
| 107 --- src/dird/bacula-dir.conf.in.orig 2008-06-19 21:44:34.000000000 +0200 | 112 --- src/dird/bacula-dir.conf.in.orig 2009-07-15 19:05:40.000000000 +0200 |
| 108 +++ src/dird/bacula-dir.conf.in 2008-11-19 23:10:11.001069502 +0100 | 113 +++ src/dird/bacula-dir.conf.in 2009-09-17 00:45:04.055970595 +0200 |
| 109 @@ -29,7 +29,8 @@ | 114 @@ -29,7 +29,8 @@ |
| 110 Level = Incremental | 115 Level = Incremental |
| 111 Client = @hostname@-fd | 116 Client = @basename@-fd |
| 112 FileSet = "Full Set" | 117 FileSet = "Full Set" |
| 113 - Schedule = "WeeklyCycle" | 118 - Schedule = "WeeklyCycle" |
| 114 + #Schedule = "WeeklyCycle" | 119 + #Schedule = "WeeklyCycle" |
| 115 + Schedule = "NEVER" | 120 + Schedule = "NEVER" |
| 116 Storage = File | 121 Storage = File |
| 118 Pool = Default | 123 Pool = Default |
| 119 @@ -109,7 +110,7 @@ | 124 @@ -109,7 +110,7 @@ |
| 120 # directory to give a reasonable FileSet to backup to | 125 # directory to give a reasonable FileSet to backup to |
| 121 # disk storage during initial testing. | 126 # disk storage during initial testing. |
| 122 # | 127 # |
| 123 - File = @BUILD_DIR@ | 128 - File = @sbindir@ |
| 124 + File = @scriptdir@ | 129 + File = @scriptdir@ |
| 125 } | 130 } |
| 126 | 131 |
| 127 # | 132 # |
| 128 @@ -124,6 +125,11 @@ | 133 @@ -126,6 +127,11 @@ |
| 129 } | 134 } |
| 130 } | 135 } |
| 131 | 136 |
| 132 +# This schedule can be used to disable automatic scheduling | 137 +# This schedule can be used to disable automatic scheduling |
| 133 +Schedule { | 138 +Schedule { |
