Merge commit 'upstream/2.6.1p2'

[debian/amanda] / client-src / selfcheck.c

diff --git a/client-src/selfcheck.c b/client-src/selfcheck.c
index ac47d90e4843957fcdb5b0d48d87bded05264702..763ac323c535d8eb83c58d8a301122e5cc6b7b3e 100644 (file)
--- a/client-src/selfcheck.c
+++ b/client-src/selfcheck.c
@@ -1078,8 +1078,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
@@ -1089,15 +1089,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);
        }
     }
 
@@ -1108,7 +1108,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