projects
/
debian
/
amanda
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge commit 'upstream/3.3.0'
[debian/amanda]
/
client-src
/
selfcheck.c
diff --git
a/client-src/selfcheck.c
b/client-src/selfcheck.c
index 5f6cb075db48e0495d8a99501e3b197bacbdd14a..5234f0f993cb4719d23bbf626602197ca88e43aa 100644
(file)
--- a/
client-src/selfcheck.c
+++ b/
client-src/selfcheck.c
@@
-313,6
+313,9
@@
main(
err_extra = errmsg;
goto err;
}
err_extra = errmsg;
goto err;
}
+ if (merge_dles_properties(dles, 1) == 0) {
+ goto checkoverall;
+ }
for (dle = dles; dle != NULL; dle = dle->next) {
run_client_scripts(EXECUTE_ON_PRE_HOST_AMCHECK, g_options, dle,
stdout);
for (dle = dles; dle != NULL; dle = dle->next) {
run_client_scripts(EXECUTE_ON_PRE_HOST_AMCHECK, g_options, dle,
stdout);
@@
-335,6
+338,7
@@
main(
}
}
}
}
+checkoverall:
check_overall();
amfree(line);
check_overall();
amfree(line);
@@
-1124,8
+1128,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
@@
-1135,15
+1139,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);
}
}
}
}
@@
-1155,6
+1159,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("/var/lib", (off_t)64); /* for /var/lib/dumpdates writing */
check_space("/etc", (off_t)64); /* for /etc/dumpdates writing */
}
}
check_space("/etc", (off_t)64); /* for /etc/dumpdates writing */
}
}