we use /var/lib/dumpdates, *not* /etc/dumpdates

diff --git a/client-src/amandates.c b/client-src/amandates.c
index c16b246fb81904e92dd9c1861236ceea760820bf..cdeafe3d2bc92e58c771e33308c6325c9e97c56e 100644 (file)
--- 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 $
  *
 /*
  * $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
  */
 
  * GNUTAR dates
  */
 


@@ -314,7 +314,7 @@ import_dumpdates(
 
     devname = amname_to_devname(amdp->name);
 
 
     devname = amname_to_devname(amdp->name);
 

-    if((dumpdf = fopen("/etc/dumpdates", "r")) == NULL) {
+    if((dumpdf = fopen("/var/lib/dumpdates", "r")) == NULL) {

        amfree(devname);
        return;
     }
        amfree(devname);
        return;
     }

diff --git a/client-src/selfcheck.c b/client-src/selfcheck.c
index 416daf297d4e29de77478ca872f65b08fc127a60..fd814f783912208ccf8fdb022557b91373e736cf 100644 (file)
--- 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 ) {
        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
 #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) {
        } 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) {
            }
 #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(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
 }
 
 static void

diff --git a/debian/amanda.conf.in b/debian/amanda.conf.in
index 566007030b0d488b11bf6d1d0113083fdbb9feb7..3760360e42be1283ae401a8c8f468d70cc7ab5e0 100644 (file)
--- 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    - 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
 #                @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
 
 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
     compress none
     record no
     priority medium


@@ -618,7 +618,7 @@ define dumptype nocomp-test {
 
 define dumptype comp-test {
     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
 }
 
     compress client fast
 }
 

diff --git a/example/amanda.conf b/example/amanda.conf
index db0066c28dce30d076fc9d5fb4002fbdbb17df2e..29154f1bd6c7cc595fc483319f884bfaee962099 100644 (file)
--- 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    - 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
 #                @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
 
 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
     compress none
     record no
     priority medium


@@ -648,7 +648,7 @@ define dumptype nocomp-test {
 
 define dumptype comp-test {
     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
 }
 
     compress client fast
 }
 

diff --git a/example/amanda.conf.in b/example/amanda.conf.in
index 57f1befc9baeb0032e2ec50b270c50acfc43bcfb..974136952472ae54fbde965d10fe323d85b8bec2 100644 (file)
--- 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    - 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
 #                @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
 
 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
     compress none
     record no
     priority medium


@@ -648,7 +648,7 @@ define dumptype nocomp-test {
 
 define dumptype comp-test {
     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
 }
 
     compress client fast
 }
 

diff --git a/example/config.site b/example/config.site
index 134a4d23c76cc054fe909320edd502c6eb6dcf6d..04c0b3f6f0cf78bcb0234abaff91702cc8723950 100644 (file)
--- 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
 #                      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
 
 
 # FORCE_USERID=no
 
 

diff --git a/example/template.d/dumptypes b/example/template.d/dumptypes
index da67d455808cbd9a24812c672c7b821c6aa36a9e..b19189f923b2b97c00cbd9ae2659e67babc37a31 100644 (file)
--- 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    - 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
 #                /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
 
 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
     compress none
     record no
     priority medium


@@ -333,7 +333,7 @@ define dumptype nocomp-test {
 
 define dumptype comp-test {
     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
 }
 
     compress client fast
 }
 

diff --git a/man/amanda.conf.5 b/man/amanda.conf.5
index 61389060c2da612f5cdb201fa96ae328684cb54c..67d0849c32c0967c50dedd0cdb4f3e3b558fadd0 100644 (file)
--- 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\&.
 .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\&.
 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 59f8e0b669d52c5dc09076abdefe894574d14dbf..0cbd48308138a907bcdc55fa05e0aadfaa9fa94f 100644 (file)
--- 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
 \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
 .RE
 .PP
 \fIspindle\fR

diff --git a/man/entities/global.entities.in b/man/entities/global.entities.in
index 619bb6f3854f3605988ad708c89bb2da3b5a6d89..58d8131b7cc1011a19be64c2a26c450533c01d0b 100644 (file)
--- a/man/entities/global.entities.in
+++ b/man/entities/global.entities.in
@@ -75,7 +75,7 @@
 <!ENTITY tapelist '<citerefentry><refentrytitle>tapelist</refentrytitle><manvolnum>5</manvolnum></citerefentry>'>
 
 <!-- IDs for files used by AMANDA-->
 <!ENTITY tapelist '<citerefentry><refentrytitle>tapelist</refentrytitle><manvolnum>5</manvolnum></citerefentry>'>
 
 <!-- IDs for files used by AMANDA-->

-<!ENTITY dumpdates '<filename>/etc/dumpdates</filename>'>
+<!ENTITY dumpdates '<filename>/var/lib/dumpdates</filename>'>

 
 <!-- IDs for AMANDA commands-->
 <!ENTITY amadmin ' <command>amadmin</command>'>
 
 <!-- IDs for AMANDA commands-->
 <!ENTITY amadmin ' <command>amadmin</command>'>

diff --git a/man/xml-source/amanda.conf.5.xml b/man/xml-source/amanda.conf.5.xml
index ed84492ba48e1cadc59c1ec75fc01cee6b00e6e8..02916c482bc3fc27a2d402c73e7adabddfcb78c9 100644 (file)
--- 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.
   <listitem>
 <para>Default:
 <emphasis remap='I'>yes</emphasis>.
   <listitem>
 <para>Default:
 <emphasis remap='I'>yes</emphasis>.

-Whether to ask the backup program to update its database (e.g. <filename>/etc/dumpdates</filename>
+Whether to ask the backup program to update its database (e.g. <filename>/var/lib/dumpdates</filename>

 for DUMP or <filename>/usr/local/var/amanda/gnutar-lists</filename> for GNUTAR) of time stamps.
 This is normally enabled for daily backups and turned off for periodic archival runs.</para>
   </listitem>
 for DUMP or <filename>/usr/local/var/amanda/gnutar-lists</filename> for GNUTAR) of time stamps.
 This is normally enabled for daily backups and turned off for periodic archival runs.</para>
   </listitem>

diff --git a/man/xml-source/disklist.5.xml b/man/xml-source/disklist.5.xml
index 110d4402279a72191873d91dac40fc95a41e16e7..b9aa1d9d242ea0252fd056878414f41885627ce2 100644 (file)
--- 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
 specify backup related parameters,
 such as whether to compress the backups,
 whether to record backup results in

-<filename>/etc/dumpdates</filename>, the disk's relative priority, etc.</para>
+<filename>/var/lib/dumpdates</filename>, the disk's relative priority, etc.</para>

   </listitem>
   </varlistentry>
   <varlistentry>
   </listitem>
   </varlistentry>
   <varlistentry>

diff --git a/server-src/diskfile.h b/server-src/diskfile.h
index ea6274f80d2c70b3e8b083f7e40eb667e2618092..f4ee1faaa6ad365ca0cecac689193dbf0bef3aa2 100644 (file)
--- 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 */
     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 ? */
     int                skip_incr;              /* incs done externally ? */
     int                skip_full;              /* fulls done externally ? */
     int                to_holdingdisk;         /* use holding disk ? */