secchan: Remove mention of "-f" flag as being equivalent "--fail"

[openvswitch] / lib / daemon.c

diff --git a/lib/daemon.c b/lib/daemon.c
index 4ad4af4c607a9eca9fa961750d79ac36eae165a5..a011d37fe02d9e3cf5bfb6daf265c11e089b85ed 100644 (file)
--- a/lib/daemon.c
+++ b/lib/daemon.c
@@ -37,6 +37,9 @@ static char *pidfile;
 /* Create pidfile even if one already exists and is locked? */
 static bool force;
 
+/* Should we chdir to "/". */
+static bool chdir_ = true;
+
 /* Returns the file name that would be used for a pidfile if 'name' were
  * provided to set_pidfile().  The caller must free the returned string. */
 char *
@@ -69,6 +72,13 @@ get_pidfile(void)
     return pidfile;
 }
 
+/* Sets that we do not chdir to "/". */
+void
+set_no_chdir(void)
+{
+    chdir_ = false;
+}
+
 /* Normally, die_if_already_running() will terminate the program with a message
  * if a locked pidfile already exists.  If this function is called,
  * die_if_already_running() will merely log a warning. */
@@ -209,7 +219,9 @@ daemonize(void)
             write(fds[1], &c, 1);
             close(fds[1]);
             setsid();
-            chdir("/");
+            if (chdir_) {
+                chdir("/");
+            }
             break;
 
         case -1:
@@ -228,6 +240,7 @@ daemon_usage(void)
     printf(
         "\nDaemon options:\n"
         "  -D, --detach            run in background as daemon\n"
+        "  --no-chdir              do not chdir to '/'\n"
         "  -P, --pidfile[=FILE]    create pidfile (default: %s/%s.pid)\n"
         "  -f, --force             with -P, start even if already running\n",
         ovs_rundir, program_name);