From d8d159e0a641a6478991e09f7cac064f6e703abe Mon Sep 17 00:00:00 2001 From: Bdale Garbee Date: Sat, 29 Aug 2009 03:05:49 -0600 Subject: [PATCH] we use /var/lib/dumpdates, *not* /etc/dumpdates --- client-src/amandates.c | 4 ++-- client-src/selfcheck.c | 12 ++++++------ debian/amanda.conf.in | 6 +++--- example/amanda.conf | 6 +++--- example/amanda.conf.in | 6 +++--- example/config.site | 2 +- example/template.d/dumptypes | 6 +++--- man/amanda.conf.5 | 2 +- man/disklist.5 | 2 +- man/entities/global.entities.in | 2 +- man/xml-source/amanda.conf.5.xml | 2 +- man/xml-source/disklist.5.xml | 2 +- server-src/diskfile.h | 2 +- 13 files changed, 27 insertions(+), 27 deletions(-) diff --git a/client-src/amandates.c b/client-src/amandates.c index c16b246..cdeafe3 100644 --- a/client-src/amandates.c +++ b/client-src/amandates.c @@ -26,7 +26,7 @@ /* * $Id: amandates.c,v 1.21 2006/07/25 18:35:21 martinea Exp $ * - * manage amandates file, that mimics /etc/dumpdates, but stores + * manage amandates file, that mimics /var/lib/dumpdates, but stores * GNUTAR dates */ @@ -314,7 +314,7 @@ import_dumpdates( devname = amname_to_devname(amdp->name); - if((dumpdf = fopen("/etc/dumpdates", "r")) == NULL) { + if((dumpdf = fopen("/var/lib/dumpdates", "r")) == NULL) { amfree(devname); return; } diff --git a/client-src/selfcheck.c b/client-src/selfcheck.c index 416daf2..fd814f7 100644 --- a/client-src/selfcheck.c +++ b/client-src/selfcheck.c @@ -1077,8 +1077,8 @@ check_overall(void) check_file(COMPRESS_PATH, X_OK); if (need_dump || need_xfsdump ) { - if (check_file_exist("/etc/dumpdates")) { - check_file("/etc/dumpdates", + if (check_file_exist("/var/lib/dumpdates")) { + check_file("/var/lib/dumpdates", #ifdef USE_RUNDUMP F_OK #else @@ -1088,15 +1088,15 @@ check_overall(void) } else { #ifndef USE_RUNDUMP if (access("/etc", R_OK|W_OK) == -1) { - g_printf(_("ERROR [dump will not be able to create the /etc/dumpdates file: %s]\n"), strerror(errno)); + g_printf(_("ERROR [dump will not be able to create the /var/lib/dumpdates file: %s]\n"), strerror(errno)); } #endif } } if (need_vdump) { - if (check_file_exist("/etc/vdumpdates")) { - check_file("/etc/vdumpdates", F_OK); + if (check_file_exist("/var/lib/vdumpdates")) { + check_file("/var/lib/vdumpdates", F_OK); } } @@ -1107,7 +1107,7 @@ check_overall(void) check_space(AMANDA_DBGDIR, (off_t)64); /* for amandad i/o */ #endif - check_space("/etc", (off_t)64); /* for /etc/dumpdates writing */ + check_space("/var/lib", (off_t)64); /* for /var/lib/dumpdates writing */ } static void diff --git a/debian/amanda.conf.in b/debian/amanda.conf.in index 5660070..3760360 100644 --- a/debian/amanda.conf.in +++ b/debian/amanda.conf.in @@ -428,7 +428,7 @@ define tapetype MIMSY-MEGATAPE { # program - specify the dump system to use. Valid values are "DUMP" and # "GNUTAR". Default: [program "DUMP"]. # record - record the backup in the time-stamp-database of the backup -# program (e.g. /etc/dumpdates for DUMP or +# program (e.g. /var/lib/dumpdates for DUMP or # @GNUTAR_LISTED_INCREMENTAL_DIRX@ for GNUTAR.). # Default: [record yes] # skip-full - skip the disk when a level 0 is due, to allow full backups @@ -610,7 +610,7 @@ define dumptype nocomp-high { define dumptype nocomp-test { global - comment "test dump without compression, no /etc/dumpdates recording" + comment "test dump without compression, no /var/lib/dumpdates recording" compress none record no priority medium @@ -618,7 +618,7 @@ define dumptype nocomp-test { define dumptype comp-test { nocomp-test - comment "test dump with compression, no /etc/dumpdates recording" + comment "test dump with compression, no /var/lib/dumpdates recording" compress client fast } diff --git a/example/amanda.conf b/example/amanda.conf index db0066c..29154f1 100644 --- a/example/amanda.conf +++ b/example/amanda.conf @@ -457,7 +457,7 @@ define tapetype SEAGATE-ULTRIUM-LTO { # program - specify the dump system to use. Valid values are "DUMP", # or "GNUTAR". Default: [program "DUMP"]. # record - record the backup in the time-stamp-database of the backup -# program (e.g. /etc/dumpdates for DUMP or +# program (e.g. /var/lib/dumpdates for DUMP or # @GNUTAR_LISTED_INCREMENTAL_DIRX@ for GNUTAR.). # Default: [record yes] # skip-full - skip the disk when a level 0 is due, to allow full backups @@ -640,7 +640,7 @@ define dumptype nocomp-high { define dumptype nocomp-test { global - comment "test dump without compression, no /etc/dumpdates recording" + comment "test dump without compression, no /var/lib/dumpdates recording" compress none record no priority medium @@ -648,7 +648,7 @@ define dumptype nocomp-test { define dumptype comp-test { nocomp-test - comment "test dump with compression, no /etc/dumpdates recording" + comment "test dump with compression, no /var/lib/dumpdates recording" compress client fast } diff --git a/example/amanda.conf.in b/example/amanda.conf.in index 57f1bef..9741369 100644 --- a/example/amanda.conf.in +++ b/example/amanda.conf.in @@ -457,7 +457,7 @@ define tapetype SEAGATE-ULTRIUM-LTO { # program - specify the dump system to use. Valid values are "DUMP", # or "GNUTAR". Default: [program "DUMP"]. # record - record the backup in the time-stamp-database of the backup -# program (e.g. /etc/dumpdates for DUMP or +# program (e.g. /var/lib/dumpdates for DUMP or # @GNUTAR_LISTED_INCREMENTAL_DIRX@ for GNUTAR.). # Default: [record yes] # skip-full - skip the disk when a level 0 is due, to allow full backups @@ -640,7 +640,7 @@ define dumptype nocomp-high { define dumptype nocomp-test { global - comment "test dump without compression, no /etc/dumpdates recording" + comment "test dump without compression, no /var/lib/dumpdates recording" compress none record no priority medium @@ -648,7 +648,7 @@ define dumptype nocomp-test { define dumptype comp-test { nocomp-test - comment "test dump with compression, no /etc/dumpdates recording" + comment "test dump with compression, no /var/lib/dumpdates recording" compress client fast } diff --git a/example/config.site b/example/config.site index 134a4d2..04c0b3f 100644 --- a/example/config.site +++ b/example/config.site @@ -138,7 +138,7 @@ # host. This type of operation normally requires that # the CLIENT_LOGIN be in some group that has read # permissions on the raw disk devices, and read/write -# permissions on /etc/dumpdates. +# permissions on /var/lib/dumpdates. # FORCE_USERID=no diff --git a/example/template.d/dumptypes b/example/template.d/dumptypes index da67d45..b19189f 100644 --- a/example/template.d/dumptypes +++ b/example/template.d/dumptypes @@ -106,7 +106,7 @@ # program - specify the dump system to use. Valid values are "DUMP" # "STAR" and "GNUTAR". Default: [program "DUMP"]. # record - record the backup in the time-stamp-database of the backup -# program (e.g. /etc/dumpdates for DUMP or +# program (e.g. /var/lib/dumpdates for DUMP or # /var/lib/amanda/gnutar-lists for GNUTAR.). # Default: [record yes] # skip-full - skip the disk when a level 0 is due, to allow full backups @@ -325,7 +325,7 @@ define dumptype nocomp-high { define dumptype nocomp-test { global - comment "test dump without compression, no /etc/dumpdates recording" + comment "test dump without compression, no /var/lib/dumpdates recording" compress none record no priority medium @@ -333,7 +333,7 @@ define dumptype nocomp-test { define dumptype comp-test { nocomp-test - comment "test dump with compression, no /etc/dumpdates recording" + comment "test dump with compression, no /var/lib/dumpdates recording" compress client fast } diff --git a/man/amanda.conf.5 b/man/amanda.conf.5 index 6138906..67d0849 100644 --- a/man/amanda.conf.5 +++ b/man/amanda.conf.5 @@ -1557,7 +1557,7 @@ keyword append the values to the list of values for that property\&. .RS 4 Default: \fIyes\fR\&. Whether to ask the backup program to update its database (e\&.g\&. -/etc/dumpdates +/var/lib/dumpdates for DUMP or /usr/local/var/amanda/gnutar\-lists for GNUTAR) of time stamps\&. This is normally enabled for daily backups and turned off for periodic archival runs\&. diff --git a/man/disklist.5 b/man/disklist.5 index 59f8e0b..0cbd483 100644 --- a/man/disklist.5 +++ b/man/disklist.5 @@ -94,7 +94,7 @@ defined in the \fBamanda\&.conf\fR file\&. \fIDumptype\fRs specify backup related parameters, such as whether to compress the backups, whether to record backup results in -/etc/dumpdates, the disk\'s relative priority, etc\&. +/var/lib/dumpdates, the disk\'s relative priority, etc\&. .RE .PP \fIspindle\fR diff --git a/man/entities/global.entities.in b/man/entities/global.entities.in index 619bb6f..58d8131 100644 --- a/man/entities/global.entities.in +++ b/man/entities/global.entities.in @@ -75,7 +75,7 @@ tapelist5'> -/etc/dumpdates'> +/var/lib/dumpdates'> amadmin'> diff --git a/man/xml-source/amanda.conf.5.xml b/man/xml-source/amanda.conf.5.xml index ed84492..02916c4 100644 --- a/man/xml-source/amanda.conf.5.xml +++ b/man/xml-source/amanda.conf.5.xml @@ -1872,7 +1872,7 @@ the property to set, and the others contains its values. Default: yes. -Whether to ask the backup program to update its database (e.g. /etc/dumpdates +Whether to ask the backup program to update its database (e.g. /var/lib/dumpdates for DUMP or /usr/local/var/amanda/gnutar-lists for GNUTAR) of time stamps. This is normally enabled for daily backups and turned off for periodic archival runs. diff --git a/man/xml-source/disklist.5.xml b/man/xml-source/disklist.5.xml index 110d440..b9aa1d9 100644 --- a/man/xml-source/disklist.5.xml +++ b/man/xml-source/disklist.5.xml @@ -112,7 +112,7 @@ file. specify backup related parameters, such as whether to compress the backups, whether to record backup results in -/etc/dumpdates, the disk's relative priority, etc. +/var/lib/dumpdates, the disk's relative priority, etc. diff --git a/server-src/diskfile.h b/server-src/diskfile.h index ea6274f..f4ee1fa 100644 --- a/server-src/diskfile.h +++ b/server-src/diskfile.h @@ -105,7 +105,7 @@ typedef struct disk_s { char *clnt_decrypt_opt; /* client-side decryption option parameter to use */ double comprate[2]; /* default compression rates */ /* flag options */ - int record; /* record dump in /etc/dumpdates ? */ + int record; /* record dump in /var/lib/dumpdates ? */ int skip_incr; /* incs done externally ? */ int skip_full; /* fulls done externally ? */ int to_holdingdisk; /* use holding disk ? */ -- 2.30.2