Merge branch 'master' into next

[sliver-openvswitch.git] / xenserver / etc_init.d_vswitch-xapi-update

diff --git a/xenserver/etc_init.d_vswitch-xapi-update b/xenserver/etc_init.d_vswitch-xapi-update
index 1aa5646..1c5f079 100755 (executable)
--- a/xenserver/etc_init.d_vswitch-xapi-update
+++ b/xenserver/etc_init.d_vswitch-xapi-update
@@ -21,28 +21,13 @@
 
 . /etc/init.d/functions
 
-test -e /etc/sysconfig/vswitch && . /etc/sysconfig/vswitch
-: ${VSWITCHD_CONF:=/etc/ovs-vswitchd.conf}
-: ${VSWITCHD_PIDFILE:=/var/run/ovs-vswitchd.pid}
-: ${VSWITCHD_PRIORITY:=-5}
-: ${VSWITCHD_LOGFILE:=/var/log/ovs-vswitchd.log}
-: ${VSWITCHD_FILE_LOGLEVEL:=}
-: ${VSWITCHD_SYSLOG_LOGLEVEL:=WARN}
-: ${VSWITCHD_MEMLEAK_LOGFILE:=}
-: ${BRCOMPATD_PIDFILE:=/var/run/ovs-brcompatd.pid}
-: ${BRCOMPATD_PRIORITY:=-5}
-: ${BRCOMPATD_LOGFILE:=/var/log/ovs-brcompatd.log}
-: ${BRCOMPATD_FILE_LOGLEVEL:=}
-: ${BRCOMPATD_SYSLOG_LOGLEVEL:=WARN}
-: ${BRCOMPATD_MEMLEAK_LOGFILE:=}
-
 function do_host_call {
     xe host-call-plugin host-uuid="$INSTALLATION_UUID" plugin="vswitch-cfg-update" fn="update" >/dev/null
 }
 
 function start {
     if [ ! -f /etc/xensource-inventory ]; then
-        printf "vxwitch-xapi-update ERROR: XenSource inventory not present in /etc/xensource-inventory\n"
+        printf "vswitch-xapi-update ERROR: XenSource inventory not present in /etc/xensource-inventory\n"
         exit 1
     fi
     source /etc/xensource-inventory
@@ -60,7 +45,7 @@ case "$1" in
         start
         ;;
     help)
-        printf "vswitch [start|stop|restart]\n"
+        printf "vswitch-xapi-update [start|stop|restart]\n"
         ;;
     *)
         printf "Unknown command: $1\n"