mirror of
https://github.com/troglobit/finit.git
synced 2026-11-06 15:51:03 +00:00
Revert "Remove reconf condition when .conf reload completes"
This reverts commit 06479aa5f1.
This commit is contained in:
1 parent
9a97ab29dc
commit
781ba66905
2 files changed
+1
-9
No files matched your search
+1
-6
@@ -149,12 +149,7 @@ static int reassert(const char *fpath, const struct stat *sb, int tflg, struct F
|
|||||||
*/
|
*/
|
||||||
void cond_reassert(const char *type)
|
void cond_reassert(const char *type)
|
||||||
{
|
{
|
||||||
_d("%s", type ?: "reload done");
|
_d("%s", type);
|
||||||
if (!type) {
|
|
||||||
cond_clear(COND_RECONF);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
|
|
||||||
nftw(cond_path(type), reassert, 20, FTW_DEPTH);
|
nftw(cond_path(type), reassert, 20, FTW_DEPTH);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -231,9 +231,6 @@ restart:
|
|||||||
_d("Calling reconf hooks ...");
|
_d("Calling reconf hooks ...");
|
||||||
plugin_run_hooks(HOOK_SVC_RECONF);
|
plugin_run_hooks(HOOK_SVC_RECONF);
|
||||||
|
|
||||||
/* Done, lift reconf condition */
|
|
||||||
cond_reassert(NULL);
|
|
||||||
|
|
||||||
service_step_all(SVC_TYPE_SERVICE | SVC_TYPE_INETD);
|
service_step_all(SVC_TYPE_SERVICE | SVC_TYPE_INETD);
|
||||||
_d("Reconfiguration done");
|
_d("Reconfiguration done");
|
||||||
|
|
||||||
|
|||||||
Reference in new issue
Block a user