diff options
| author | Ian Campbell <ian.campbell@citrix.com> | 2009-12-17 14:46:52 +0000 |
|---|---|---|
| committer | Ben Pfaff <blp@nicira.com> | 2009-12-17 09:56:01 -0800 |
| commit | d1c8c9e433d18bf3446701e07557087f9078d840 (patch) | |
| tree | a1f8bdfca091aecf22b15c093c6cf09c8d755166 | |
| parent | dac3c52f893f7df16f935ef4875c5467abd4ea23 (diff) | |
| download | openvswitch-xs5.7.tar.gz | |
initscript: pass complete path to pidfile to status commandxs5.7
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>
| -rwxr-xr-x | xenserver/etc_init.d_vswitch | 4 |
1 files changed, 2 insertions, 2 deletions
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 |