ovs-vswitchd: Complete daemonization only after initial configuration.

[openvswitch] / lib / daemon.c

diff --git a/lib/daemon.c b/lib/daemon.c
index 9db6c1f8a9bd3e43901f5a6f64e1560ad90837da..a8b3fae3c6e2e5ae5505ed38077dd5b013010ca8 100644 (file)
--- a/lib/daemon.c
+++ b/lib/daemon.c
@@ -475,11 +475,14 @@ daemonize_start(void)
 }
 
 /* If daemonization is configured, then this function notifies the parent
- * process that the child process has completed startup successfully. */
+ * process that the child process has completed startup successfully.
+ *
+ * Calling this function more than once has no additional effect. */
 void
 daemonize_complete(void)
 {
     fork_notify_startup(daemonize_fd);
+    daemonize_fd = -1;
 
     if (detach) {
         setsid();
@@ -487,6 +490,7 @@ daemonize_complete(void)
             ignore(chdir("/"));
         }
         close_standard_fds();
+        detach = false;
     }
 }