OpenPKG Specs / file comparison

comparison: bacula/bacula.patch

bacula/bacula.patch

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

Mercurial Repository: OpenPKG Specs

Europalab SCM Repository Server

mercurial