Tue, 28 Aug 2012 18:36:30 +0200
Resynchronize with upstream package maintainer version.
1 Index: manpages/Makefile.in
2 --- 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 @@ -21,23 +21,21 @@
5 install:
6 $(MKDIR) $(DESTDIR)/$(mandir)/man8
7 for I in ${MAN8}; \
8 - do ($(RMF) $$I.gz; gzip -c $$I >$$I.gz; \
9 - $(INSTALL_DATA) $$I.gz $(DESTDIR)$(mandir)/man8/$$I.gz; \
10 - rm -f $$I.gz); \
11 + do \
12 + $(INSTALL_DATA) $$I $(DESTDIR)$(mandir)/man8/$$I; \
13 done
14 $(MKDIR) $(DESTDIR)/$(mandir)/man1
15 for I in ${MAN1}; \
16 - do ($(RMF) $$I.gz; gzip -c $$I >$$I.gz; \
17 - $(INSTALL_DATA) $$I.gz $(DESTDIR)$(mandir)/man1/$$I.gz; \
18 - rm -f $$I.gz); \
19 + do \
20 + $(INSTALL_DATA) $$I $(DESTDIR)$(mandir)/man1/$$I; \
21 done
23 uninstall:
24 for I in ${MAN8}; \
25 - do (rm -f $(DESTDIR)$(mandir)/man8/$$I.gz); \
26 + do (rm -f $(DESTDIR)$(mandir)/man8/$$I); \
27 done
28 for I in ${MAN1}; \
29 - do (rm -f $(DESTDIR)$(mandir)/man1/$$I.gz); \
30 + do (rm -f $(DESTDIR)$(mandir)/man1/$$I); \
31 done
33 clean:
34 Index: scripts/bacula.in
35 --- scripts/bacula.in.orig 2010-08-05 16:29:51.000000000 +0200
36 +++ scripts/bacula.in 2010-12-19 19:30:06.000000000 +0100
37 @@ -20,30 +20,36 @@
38 MALLOC_CHECK_=0
39 export MALLOC_CHECK_
41 +action=$1
42 +debug=$2
43 +[ -n "$3" ] && enable_dir=$3 || enable_dir=yes
44 +[ -n "$4" ] && enable_sd=$4 || enable_sd=yes
45 +[ -n "$5" ] && enable_fd=$5 || enable_fd=yes
46 +
47 case "$1" in
48 start)
49 - [ -x ${SCRIPTDIR}/bacula-ctl-sd ] && ${SCRIPTDIR}/bacula-ctl-sd $1 $2
50 - [ -x ${SCRIPTDIR}/bacula-ctl-fd ] && ${SCRIPTDIR}/bacula-ctl-fd $1 $2
51 - [ -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
53 + [ "$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
55 ;;
57 stop)
58 # 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
60 - [ -x ${SCRIPTDIR}/bacula-ctl-sd ] && ${SCRIPTDIR}/bacula-ctl-sd $1 $2
61 - [ -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
63 + [ "$enable_sd" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-sd ] && ${SCRIPTDIR}/bacula-ctl-sd $1 $2
64 + [ "$enable_dir" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-dir ] && ${SCRIPTDIR}/bacula-ctl-dir $1 $2
65 ;;
67 restart)
68 - $0 stop
69 + $0 stop $debug $enable_dir $enable_sd $enable_fd
70 sleep 2
71 - $0 start
72 + $0 start $debug $enable_dir $enable_sd $enable_fd
73 ;;
75 status)
76 - [ -x ${SCRIPTDIR}/bacula-ctl-sd ] && ${SCRIPTDIR}/bacula-ctl-sd status
77 - [ -x ${SCRIPTDIR}/bacula-ctl-fd ] && ${SCRIPTDIR}/bacula-ctl-fd status
78 - [ -x ${SCRIPTDIR}/bacula-ctl-dir ] && ${SCRIPTDIR}/bacula-ctl-dir status
79 + [ "$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
81 + [ "$enable_dir" = "yes" ] && [ -x ${SCRIPTDIR}/bacula-ctl-dir ] && ${SCRIPTDIR}/bacula-ctl-dir status
82 ;;
84 *)
85 Index: src/dird/bacula-dir.conf.in
86 --- 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
88 @@ -29,7 +29,8 @@
89 Level = Incremental
90 Client = @basename@-fd
91 FileSet = "Full Set"
92 - Schedule = "WeeklyCycle"
93 + #Schedule = "WeeklyCycle"
94 + Schedule = "NEVER"
95 Storage = File
96 Messages = Standard
97 Pool = File
98 @@ -123,6 +124,11 @@
99 }
100 }
102 +# This schedule can be used to disable automatic scheduling
103 +Schedule {
104 + Name = NEVER
105 +}
106 +
107 #
108 # When to do the backups, full backup on first sunday of the month,
109 # differential (i.e. incremental since full) every other sunday,