diff options
| author | Ian Campbell <Ian.Campbell@citrix.com> | 2009-10-02 11:32:10 +0100 |
|---|---|---|
| committer | Ben Pfaff <blp@nicira.com> | 2010-03-26 14:42:33 -0700 |
| commit | 7c632268f215bc91a26831b171c4ba04a343ae8e (patch) | |
| tree | 997559cab80ffdb33f682e317e404e64dafbed6f /xenserver/etc_init.d_openvswitch | |
| parent | bc39196036f8e33d15274855087f0c47be2095ee (diff) | |
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.
Diffstat (limited to 'xenserver/etc_init.d_openvswitch')
| -rwxr-xr-x | xenserver/etc_init.d_openvswitch | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/xenserver/etc_init.d_openvswitch b/xenserver/etc_init.d_openvswitch index f531d45c..0101562f 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 |