bacula/bacula.patch

Wed, 07 Jan 2009 00:25:41 +0100

author
Michael Schloh von Bennewitz <michael@schloh.com>
date
Wed, 07 Jan 2009 00:25:41 +0100
changeset 20
8adc5213fd55
child 21
5ba5c2911c12
permissions
-rw-r--r--

Import package vendor original specs for necessary manipulations.

     1 Index: manpages/Makefile.in
     2 --- manpages/Makefile.in.orig	2007-04-24 17:47:01 +0200
     3 +++ manpages/Makefile.in	2008-07-09 07:45:59 +0200
     4 @@ -20,23 +20,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:	dummy
    34 Index: scripts/bacula.in
    35 --- scripts/bacula.in.orig	2008-07-06 15:06:15 +0200
    36 +++ scripts/bacula.in	2008-07-09 07:53:22 +0200
    37 @@ -15,30 +15,36 @@
    38  #  
    39  SCRIPTDIR=@scriptdir@
    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: scripts/btraceback.in
    86 --- scripts/btraceback.in.orig	2008-06-01 10:49:00 +0200
    87 +++ scripts/btraceback.in	2008-07-09 07:45:59 +0200
    88 @@ -12,6 +12,9 @@
    89  PNAME="${PNAME} on `hostname`"
    90  if test `uname -s` = SunOS ; then
    91    gcore -o @working_dir@/${PNAME} $2
    92 +fi
    93 +if test `uname -s` = SunOS &&
    94 +   test -n `which dbx 2>/dev/null` ; then
    95    dbx $1 $2 <@scriptdir@/btraceback.dbx 2>&1 \
    96     | @sbindir@/bsmtp -h @smtp_host@ -f @dump_email@ -s "Bacula DBX traceback of ${PNAME}" @dump_email@
    97  else
    98 Index: src/dird/bacula-dir.conf.in
    99 --- src/dird/bacula-dir.conf.in.orig	2008-06-19 21:44:34 +0200
   100 +++ src/dird/bacula-dir.conf.in	2008-07-09 07:45:59 +0200
   101 @@ -29,7 +29,8 @@
   102    Level = Incremental
   103    Client = @hostname@-fd 
   104    FileSet = "Full Set"
   105 -  Schedule = "WeeklyCycle"
   106 + #Schedule = "WeeklyCycle"
   107 +  Schedule = "NEVER"
   108    Storage = File
   109    Messages = Standard
   110    Pool = Default
   111 @@ -109,7 +110,7 @@
   112  #    directory to give a reasonable FileSet to backup to
   113  #    disk storage during initial testing.
   114  #
   115 -    File = @BUILD_DIR@
   116 +    File = @scriptdir@
   117    }
   119  #
   120 @@ -124,6 +125,11 @@
   121    }
   122  }
   124 +# This schedule can be used to disable automatic scheduling
   125 +Schedule {
   126 +  Name = NEVER
   127 +}
   128 +
   129  #
   130  # When to do the backups, full backup on first sunday of the month,
   131  #  differential (i.e. incremental since full) every other sunday,

mercurial