comparison: bacula/bacula.patch
bacula/bacula.patch
- changeset 579
- 6b18bb69901e
- parent 578
- ac1eb2cd38a8
- child 649
- c44c510c1c7f
equal
deleted
inserted
replaced
| 6:884feec87873 | 7:65cbeed7c9bb |
|---|---|
| 1 Index: manpages/Makefile.in | 1 Index: manpages/Makefile.in |
| 2 diff -Nau manpages/Makefile.in.orig manpages/Makefile.in | |
| 2 --- manpages/Makefile.in.orig 2010-08-05 16:29:51.000000000 +0200 | 3 --- manpages/Makefile.in.orig 2010-08-05 16:29:51.000000000 +0200 |
| 3 +++ manpages/Makefile.in 2010-12-19 19:30:06.000000000 +0100 | 4 +++ manpages/Makefile.in 2010-12-19 19:30:06.000000000 +0100 |
| 4 @@ -21,23 +21,21 @@ | 5 @@ -21,23 +21,21 @@ |
| 5 install: | 6 install: |
| 6 $(MKDIR) $(DESTDIR)/$(mandir)/man8 | 7 $(MKDIR) $(DESTDIR)/$(mandir)/man8 |
| 30 + do (rm -f $(DESTDIR)$(mandir)/man1/$$I); \ | 31 + do (rm -f $(DESTDIR)$(mandir)/man1/$$I); \ |
| 31 done | 32 done |
| 32 | 33 |
| 33 clean: | 34 clean: |
| 34 Index: scripts/bacula.in | 35 Index: scripts/bacula.in |
| 36 diff -Nau scripts/bacula.in.orig scripts/bacula.in | |
| 35 --- scripts/bacula.in.orig 2010-08-05 16:29:51.000000000 +0200 | 37 --- scripts/bacula.in.orig 2010-08-05 16:29:51.000000000 +0200 |
| 36 +++ scripts/bacula.in 2010-12-19 19:30:06.000000000 +0100 | 38 +++ scripts/bacula.in 2010-12-19 19:30:06.000000000 +0100 |
| 37 @@ -20,30 +20,36 @@ | 39 @@ -13,37 +13,43 @@ |
| 40 # easier to "steal" this code for the development | |
| 41 # environment where they are different. | |
| 42 # | |
| 43 -SCRIPTDIR=@scriptdir@ | |
| 44 +SCRIPTDIR=@libexecdir@ | |
| 45 # | |
| 46 # Disable Glibc malloc checks, it doesn't help and it keeps from getting | |
| 47 # good dumps | |
| 38 MALLOC_CHECK_=0 | 48 MALLOC_CHECK_=0 |
| 39 export MALLOC_CHECK_ | 49 export MALLOC_CHECK_ |
| 40 | 50 |
| 51 -case "$1" in | |
| 41 +action=$1 | 52 +action=$1 |
| 42 +debug=$2 | 53 +debug=$2 |
| 43 +[ -n "$3" ] && enable_dir=$3 || enable_dir=yes | 54 +[ -n "$3" ] && enable_dir=$3 || enable_dir=yes |
| 44 +[ -n "$4" ] && enable_sd=$4 || enable_sd=yes | 55 +[ -n "$4" ] && enable_sd=$4 || enable_sd=yes |
| 45 +[ -n "$5" ] && enable_fd=$5 || enable_fd=yes | 56 +[ -n "$5" ] && enable_fd=$5 || enable_fd=yes |
| 46 + | 57 + |
| 47 case "$1" in | 58 +case "$action" in |
| 48 start) | 59 start) |
| 49 - [ -x ${SCRIPTDIR}/bacula-ctl-sd ] && ${SCRIPTDIR}/bacula-ctl-sd $1 $2 | 60 - [ -x ${SCRIPTDIR}/bacula-ctl-sd ] && ${SCRIPTDIR}/bacula-ctl-sd $1 $2 |
| 50 - [ -x ${SCRIPTDIR}/bacula-ctl-fd ] && ${SCRIPTDIR}/bacula-ctl-fd $1 $2 | 61 - [ -x ${SCRIPTDIR}/bacula-ctl-fd ] && ${SCRIPTDIR}/bacula-ctl-fd $1 $2 |
| 51 - [ -x ${SCRIPTDIR}/bacula-ctl-dir ] && ${SCRIPTDIR}/bacula-ctl-dir $1 $2 | 62 - [ -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 | 63 + [ "$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 | 64 + [ "$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 | 65 + [ "$enable_dir" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-dir ] && ${SCRIPTDIR}/bacula-ctl-dir $1 $2 |
| 55 ;; | 66 ;; |
| 56 | 67 |
| 57 stop) | 68 stop) |
| 58 # 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 |
| 59 - [ -x ${SCRIPTDIR}/bacula-ctl-fd ] && ${SCRIPTDIR}/bacula-ctl-fd $1 $2 | 70 - [ -x ${SCRIPTDIR}/bacula-ctl-fd ] && ${SCRIPTDIR}/bacula-ctl-fd $1 $2 |
| 60 - [ -x ${SCRIPTDIR}/bacula-ctl-sd ] && ${SCRIPTDIR}/bacula-ctl-sd $1 $2 | 71 - [ -x ${SCRIPTDIR}/bacula-ctl-sd ] && ${SCRIPTDIR}/bacula-ctl-sd $1 $2 |
| 61 - [ -x ${SCRIPTDIR}/bacula-ctl-dir ] && ${SCRIPTDIR}/bacula-ctl-dir $1 $2 | 72 - [ -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 | 73 + [ "$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 | 74 + [ "$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 | 75 + [ "$enable_dir" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-dir ] && ${SCRIPTDIR}/bacula-ctl-dir $1 $2 |
| 65 ;; | 76 ;; |
| 66 | 77 |
| 67 restart) | 78 restart) |
| 68 - $0 stop | 79 - $0 stop |
| 69 + $0 stop $debug $enable_dir $enable_sd $enable_fd | 80 + $0 stop $debug $enable_dir $enable_sd $enable_fd |
| 70 sleep 2 | 81 sleep 2 |
| 71 - $0 start | 82 - $0 start |
| 72 + $0 start $debug $enable_dir $enable_sd $enable_fd | 83 + $0 start $debug $enable_dir $enable_sd $enable_fd |
| 73 ;; | 84 ;; |
| 74 | 85 |
| 75 status) | 86 status) |
| 76 - [ -x ${SCRIPTDIR}/bacula-ctl-sd ] && ${SCRIPTDIR}/bacula-ctl-sd status | 87 - [ -x ${SCRIPTDIR}/bacula-ctl-sd ] && ${SCRIPTDIR}/bacula-ctl-sd status |
| 77 - [ -x ${SCRIPTDIR}/bacula-ctl-fd ] && ${SCRIPTDIR}/bacula-ctl-fd status | 88 - [ -x ${SCRIPTDIR}/bacula-ctl-fd ] && ${SCRIPTDIR}/bacula-ctl-fd status |
| 78 - [ -x ${SCRIPTDIR}/bacula-ctl-dir ] && ${SCRIPTDIR}/bacula-ctl-dir status | 89 - [ -x ${SCRIPTDIR}/bacula-ctl-dir ] && ${SCRIPTDIR}/bacula-ctl-dir status |
| 79 + [ "$enable_sd" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-sd ] && ${SCRIPTDIR}/bacula-ctl-sd status | 90 + [ "$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 | 91 + [ "$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 | 92 + [ "$enable_dir" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-dir ] && ${SCRIPTDIR}/bacula-ctl-dir status |
| 82 ;; | 93 ;; |
| 83 | 94 |
| 84 *) | 95 *) |
| 85 Index: src/dird/bacula-dir.conf.in | 96 Index: src/dird/bacula-dir.conf.in |
| 97 diff -Nau src/dird/bacula-dir.conf.in.orig src/dird/bacula-dir.conf.in | |
| 86 --- src/dird/bacula-dir.conf.in.orig 2010-08-05 16:29:51.000000000 +0200 | 98 --- src/dird/bacula-dir.conf.in.orig 2010-08-05 16:29:51.000000000 +0200 |
| 87 +++ src/dird/bacula-dir.conf.in 2010-12-19 19:30:06.000000000 +0100 | 99 +++ src/dird/bacula-dir.conf.in 2010-12-19 19:30:06.000000000 +0100 |
| 88 @@ -29,7 +29,8 @@ | |
| 89 Level = Incremental | 100 Level = Incremental |
| 90 Client = @basename@-fd | 101 Client = @basename@-fd |
| 91 FileSet = "Full Set" | 102 FileSet = "Full Set" |
| 92 - Schedule = "WeeklyCycle" | 103 - Schedule = "WeeklyCycle" |
| 93 + #Schedule = "WeeklyCycle" | 104 + #Schedule = "WeeklyCycle" |
| 94 + Schedule = "NEVER" | 105 + Schedule = "NEVER" |
| 95 Storage = File | 106 Storage = File |
| 96 Messages = Standard | 107 Messages = Standard |
| 97 Pool = File | 108 Pool = File |
| 109 @@ -106,7 +107,7 @@ | |
| 110 # directory to give a reasonable FileSet to backup to | |
| 111 # disk storage during initial testing. | |
| 112 # | |
| 113 - File = @sbindir@ | |
| 114 + File = @scriptdir@ | |
| 115 } | |
| 116 | |
| 117 # | |
| 98 @@ -123,6 +124,11 @@ | 118 @@ -123,6 +124,11 @@ |
| 99 } | 119 } |
| 100 } | 120 } |
| 101 | 121 |
| 102 +# This schedule can be used to disable automatic scheduling | 122 +# This schedule can be used to disable automatic scheduling |
