From 781ba66905e58edfd008b2564e1b0ea2ff0394d5 Mon Sep 17 00:00:00 2001
From: Joachim Nilsson <troglobit@gmail.com>
Date: Tue, 24 Oct 2017 13:07:48 +0200
Subject: [PATCH] Revert "Remove reconf condition when .conf reload completes"

This reverts commit 06479aa5f1a5a89205c400afadb081f76ed37a84.
---
 src/cond-w.c | 7 +------
 src/sm.c     | 3 ---
 2 files changed, 1 insertion(+), 9 deletions(-)

diff --git a/src/cond-w.c b/src/cond-w.c
index d9ecc94b..63d98f02 100644
--- a/src/cond-w.c
+++ b/src/cond-w.c
@@ -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);
 }
 
diff --git a/src/sm.c b/src/sm.c
index 1495840a..7bc8a8d4 100644
--- a/src/sm.c
+++ b/src/sm.c
@@ -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");