[ovs-dev] [PATCH V2 2/4] ovs-ofctl: Fixed PID file naming on windows

Paul Boca pboca at cloudbasesolutions.com
Wed Jun 1 11:46:28 UTC 2016


If the --pidfile option doesn't contain ":" then the PID file name is always ovs-ofctl.pid

Signed-off-by: Paul-Daniel Boca <pboca at cloudbasesolutions.com>
---
 lib/daemon-windows.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/lib/daemon-windows.c b/lib/daemon-windows.c
index ac71aa1..8cf0fea 100644
--- a/lib/daemon-windows.c
+++ b/lib/daemon-windows.c
@@ -485,8 +485,12 @@ daemon_become_new_user(bool access_datapath OVS_UNUSED)
 char *
 make_pidfile_name(const char *name)
 {
-    if (name && strchr(name, ':')) {
-        return xstrdup(name);
+    if (name) {
+        if (strchr(name, ':')) {
+            return xstrdup(name);
+        } else {
+            return xasprintf("%s/%s", ovs_rundir(), name);
+        }
     } else {
         return xasprintf("%s/%s.pid", ovs_rundir(), program_name);
     }
-- 
2.7.2.windows.1



More information about the dev mailing list