1 Description: make dumpdates path in docs match Debian configuration
2 Author: Bdale Garbee <bdale@gag.com>
4 --- amanda-3.3.0.orig/man/disklist.5
5 +++ amanda-3.3.0/man/disklist.5
6 @@ -89,7 +89,7 @@ defined in the
9 \fIDumptype\fRs specify backup related parameters, such as whether to compress the backups, whether to record backup results in
10 -/etc/dumpdates, the disk\*(Aqs relative priority, etc\&.
11 +/var/lib/dumpdates, the disk\*(Aqs relative priority, etc\&.
15 --- amanda-3.3.0.orig/man/amanda.conf.5
16 +++ amanda-3.3.0/man/amanda.conf.5
17 @@ -1672,8 +1672,8 @@ keyword append the values to the list of
18 \fBrecord\fR \fIboolean\fR
21 -\fByes\fR\&. Whether to ask the backup program to update its database (e\&.g\&.
23 +\fIyes\fR\&. Whether to ask the backup program to update its database (e\&.g\&.
26 /usr/local/var/amanda/gnutar\-lists
27 for GNUTAR) of time stamps\&. This is normally enabled for daily backups and turned off for periodic archival runs\&.
28 --- amanda-3.3.0.orig/man/entities/global.entities.in
29 +++ amanda-3.3.0/man/entities/global.entities.in
31 <!ENTITY tapelist '<manref name="tapelist" vol="5"/>'>
33 <!-- IDs for files used by AMANDA-->
34 -<!ENTITY dumpdates '<filename>/etc/dumpdates</filename>'>
35 +<!ENTITY dumpdates '<filename>/var/lib/dumpdates</filename>'>
37 <!-- IDs for AMANDA commands-->
38 <!ENTITY amadmin ' <command>amadmin</command>'>
39 --- amanda-3.3.0.orig/man/xml-source/disklist.5.xml
40 +++ amanda-3.3.0/man/xml-source/disklist.5.xml
41 @@ -112,7 +112,7 @@ file.
42 specify backup related parameters,
43 such as whether to compress the backups,
44 whether to record backup results in
45 -<filename>/etc/dumpdates</filename>, the disk's relative priority, etc.</para>
46 +<filename>/var/lib/dumpdates</filename>, the disk's relative priority, etc.</para>
50 --- amanda-3.3.0.orig/man/xml-source/amanda.conf.5.xml
51 +++ amanda-3.3.0/man/xml-source/amanda.conf.5.xml
52 @@ -2155,8 +2155,8 @@ the property to set, and the others cont
53 <term><amkeyword>record</amkeyword> <amtype>boolean</amtype></term>
56 -<amkeyword>yes</amkeyword>.
57 -Whether to ask the backup program to update its database (e.g. <filename>/etc/dumpdates</filename>
58 +<emphasis remap='I'>yes</emphasis>.
59 +Whether to ask the backup program to update its database (e.g. <filename>/var/lib/dumpdates</filename>
60 for DUMP or <filename>/usr/local/var/amanda/gnutar-lists</filename> for GNUTAR) of time stamps.
61 This is normally enabled for daily backups and turned off for periodic archival runs.</para>
63 --- amanda-3.3.0.orig/client-src/amandates.c
64 +++ amanda-3.3.0/client-src/amandates.c
67 * $Id: amandates.c,v 1.21 2006/07/25 18:35:21 martinea Exp $
69 - * manage amandates file, that mimics /etc/dumpdates, but stores
70 + * manage amandates file, that mimics /var/lib/dumpdates, but stores
74 @@ -314,7 +314,7 @@ import_dumpdates(
76 devname = amname_to_devname(amdp->name);
78 - if((dumpdf = fopen("/etc/dumpdates", "r")) == NULL) {
79 + if((dumpdf = fopen("/var/lib/dumpdates", "r")) == NULL) {
83 --- amanda-3.3.0.orig/client-src/selfcheck.c
84 +++ amanda-3.3.0/client-src/selfcheck.c
85 @@ -1128,8 +1128,8 @@ check_overall(void)
86 check_file(COMPRESS_PATH, X_OK);
88 if (need_dump || need_xfsdump ) {
89 - if (check_file_exist("/etc/dumpdates")) {
90 - check_file("/etc/dumpdates",
91 + if (check_file_exist("/var/lib/dumpdates")) {
92 + check_file("/var/lib/dumpdates",
96 @@ -1139,15 +1139,15 @@ check_overall(void)
99 if (access("/etc", R_OK|W_OK) == -1) {
100 - g_printf(_("ERROR [dump will not be able to create the /etc/dumpdates file: %s]\n"), strerror(errno));
101 + g_printf(_("ERROR [dump will not be able to create the /var/lib/dumpdates file: %s]\n"), strerror(errno));
108 - if (check_file_exist("/etc/vdumpdates")) {
109 - check_file("/etc/vdumpdates", F_OK);
110 + if (check_file_exist("/var/lib/vdumpdates")) {
111 + check_file("/var/lib/vdumpdates", F_OK);
115 @@ -1159,6 +1159,7 @@ check_overall(void)
116 check_space(AMANDA_DBGDIR, (off_t)64); /* for amandad i/o */
119 + check_space("/var/lib", (off_t)64); /* for /var/lib/dumpdates writing */
120 check_space("/etc", (off_t)64); /* for /etc/dumpdates writing */
123 --- amanda-3.3.0.orig/server-src/diskfile.h
124 +++ amanda-3.3.0/server-src/diskfile.h
125 @@ -110,7 +110,7 @@ typedef struct disk_s {
126 char *clnt_decrypt_opt; /* client-side decryption option parameter to use */
127 double comprate[2]; /* default compression rates */
129 - int record; /* record dump in /etc/dumpdates ? */
130 + int record; /* record dump in /var/lib/dumpdates ? */
131 int skip_incr; /* incs done externally ? */
132 int skip_full; /* fulls done externally ? */
133 int to_holdingdisk; /* use holding disk ? */
134 --- amanda-3.3.0.orig/example/amanda.conf.in
135 +++ amanda-3.3.0/example/amanda.conf.in
136 @@ -460,7 +460,7 @@ define tapetype SEAGATE-ULTRIUM-LTO {
137 # program - specify the dump system to use. Valid values are "DUMP",
138 # or "GNUTAR". Default: [program "DUMP"].
139 # record - record the backup in the time-stamp-database of the backup
140 -# program (e.g. /etc/dumpdates for DUMP or
141 +# program (e.g. /var/lib/dumpdates for DUMP or
142 # @GNUTAR_LISTED_INCREMENTAL_DIRX@ for GNUTAR.).
143 # Default: [record yes]
144 # skip-full - skip the disk when a level 0 is due, to allow full backups
145 @@ -621,7 +621,7 @@ define dumptype nocomp-high {
147 define dumptype nocomp-test {
149 - comment "test dump without compression, no /etc/dumpdates recording"
150 + comment "test dump without compression, no /var/lib/dumpdates recording"
154 @@ -629,7 +629,7 @@ define dumptype nocomp-test {
156 define dumptype comp-test {
158 - comment "test dump with compression, no /etc/dumpdates recording"
159 + comment "test dump with compression, no /var/lib/dumpdates recording"
163 --- amanda-3.3.0.orig/example/template.d/dumptypes
164 +++ amanda-3.3.0/example/template.d/dumptypes
166 # program - specify the dump system to use. Valid values are "DUMP"
167 # "STAR" and "GNUTAR". Default: [program "DUMP"].
168 # record - record the backup in the time-stamp-database of the backup
169 -# program (e.g. /etc/dumpdates for DUMP or
170 +# program (e.g. /var/lib/dumpdates for DUMP or
171 # /var/lib/amanda/gnutar-lists for GNUTAR.).
172 # Default: [record yes]
173 # skip-full - skip the disk when a level 0 is due, to allow full backups
174 @@ -302,7 +302,7 @@ define dumptype nocomp-high {
176 define dumptype nocomp-test {
178 - comment "test dump without compression, no /etc/dumpdates recording"
179 + comment "test dump without compression, no /var/lib/dumpdates recording"
183 @@ -310,7 +310,7 @@ define dumptype nocomp-test {
185 define dumptype comp-test {
187 - comment "test dump with compression, no /etc/dumpdates recording"
188 + comment "test dump with compression, no /var/lib/dumpdates recording"