From: Ian Campbell <Ian.Campbell@citrix.com>
Date: Fri, 2 Oct 2009 10:32:10 +0000 (+0100)
Subject: xenserver: Correct "service vswitch status" when brcompatd is disabled
X-Git-Tag: v1.0.0~221
X-Git-Url: http://git.onelab.eu/?a=commitdiff_plain;h=7c632268f215bc91a26831b171c4ba04a343ae8e;p=sliver-openvswitch.git

xenserver: Correct "service vswitch status" when brcompatd is disabled

I don't think it makes sense to report brcompatd's status when it is
explicitly disabled. Doing so causes service status to return an error
when brcompatd is deliberately disabled.

Also fix up a tab vs. spaces whitespace snafu.
---

diff --git a/xenserver/etc_init.d_openvswitch b/xenserver/etc_init.d_openvswitch
index f531d45ce..0101562ff 100755
--- a/xenserver/etc_init.d_openvswitch
+++ b/xenserver/etc_init.d_openvswitch
@@ -384,7 +384,9 @@ function start {
     set_system_uuid
 
     start_vswitchd
-    start_brcompatd
+    if [ "${ENABLE_BRCOMPAT}" = "y" ] ; then
+        start_brcompatd
+    fi
     touch /var/lock/subsys/openvswitch
 }
 
@@ -423,7 +425,9 @@ case "$1" in
     status)
         status -p "$OVSDB_SERVER_PIDFILE" ovsdb-server
         status -p "$VSWITCHD_PIDFILE" ovs-vswitchd
-        status -p "$BRCOMPATD_PIDFILE" ovs-brcompatd
+        if [ "$ENABLE_BRCOMPAT" = "y" ] ; then
+            status -p ovs-brcompatd.pid ovs-brcompatd
+        fi
         ;;
     version)
         /usr/sbin/ovsdb-server -V