From: Ian Campbell <ian.campbell@citrix.com>
Date: Thu, 17 Dec 2009 14:46:52 +0000 (+0000)
Subject: initscript: pass complete path to pidfile to status command
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=refs%2Fheads%2Fxs5.7;p=sliver-openvswitch.git

initscript: pass complete path to pidfile to status command

Older versions of RHEL/CentOS used pifof in preference to the pidfile
and hence we got away with passing just the basename instead of
including the full path. Using pidof first doesn't make much sense and
this was fixed in RHEL 5 update 4 (see https://bugzilla.redhat.com/show_bug.cgi?id=440658)

This means that on RHEL 5.4 "service vswitch status" always returned
"ovs-vswitchd is stopped" even if it was running. Fix this issue by
passing in the correct pidfile name.

Signed-off-by: Ian Campbell <ian.campbell@citrix.com>
---

diff --git a/xenserver/etc_init.d_vswitch b/xenserver/etc_init.d_vswitch
index 884755099..298eba410 100755
--- a/xenserver/etc_init.d_vswitch
+++ b/xenserver/etc_init.d_vswitch
@@ -316,10 +316,10 @@ case "$1" in
         strace -p $(cat "$BRCOMPATD_PIDFILE") "$@"
         ;;
     status)
-        status -p ovs-vswitchd.pid ovs-vswitchd
+        status -p "$VSWITCHD_PIDFILE" ovs-vswitchd
         rc=$?
         if [ $rc -eq 0 ] && [ "$ENABLE_BRCOMPAT" = "y" ] ; then
-            status -p ovs-brcompatd.pid ovs-brcompatd
+            status -p "$BRCOMPATD_PIDFILE" ovs-brcompatd
             rc=$?
         fi
         exit $rc