• file
• revisions
• annotate
• diff
• comparison
• raw

bacula/bacula.patch@ac1eb2cd38a8 (annotated)

bacula/bacula.patch

Tue, 28 Aug 2012 18:36:30 +0200

author

Michael Schloh von Bennewitz <michael@schloh.com>

date

Tue, 28 Aug 2012 18:36:30 +0200

changeset 578

ac1eb2cd38a8

parent 577

e3c6a8f912f4

child 579

6b18bb69901e

permissions

-rw-r--r--

Resynchronize with upstream package maintainer version.

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