Revert "Remove reconf condition when .conf reload completes"

This reverts commit 06479aa5f1.
This commit is contained in:
Joachim Nilsson
2017-10-24 13:07:48 +02:00
parent 9a97ab29dc
commit 781ba66905
2 changed files with 1 additions and 9 deletions
+1 -6
View File
@@ -149,12 +149,7 @@ static int reassert(const char *fpath, const struct stat *sb, int tflg, struct F
*/
void cond_reassert(const char *type)
{
_d("%s", type ?: "reload done");
if (!type) {
cond_clear(COND_RECONF);
return;
}
_d("%s", type);
nftw(cond_path(type), reassert, 20, FTW_DEPTH);
}
-3
View File
@@ -231,9 +231,6 @@ restart:
_d("Calling reconf hooks ...");
plugin_run_hooks(HOOK_SVC_RECONF);
/* Done, lift reconf condition */
cond_reassert(NULL);
service_step_all(SVC_TYPE_SERVICE | SVC_TYPE_INETD);
_d("Reconfiguration done");