From: Justin Pettit <jpettit@nicira.com>
Date: Sat, 27 Mar 2010 02:03:52 +0000 (-0700)
Subject: xenserver: Correct renaming issue in openvswitch-xapi-update
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=22c75d593;p=openvswitch

xenserver: Correct renaming issue in openvswitch-xapi-update

A recent commit changed references from "vswitch" to "openvswitch".
This included changing the name of "vswitch-xapi-update" to
"openvswitch-xapi-update".  Unfortunately, the contents of the file
did not get similarly updated, so the script had issues.  This commit
fixes that.
---

diff --git a/xenserver/etc_init.d_openvswitch-xapi-update b/xenserver/etc_init.d_openvswitch-xapi-update
index 1c5f0798..bc62ba21 100755
--- a/xenserver/etc_init.d_openvswitch-xapi-update
+++ b/xenserver/etc_init.d_openvswitch-xapi-update
@@ -1,11 +1,11 @@
 #!/bin/bash
 #
-# vswitch-xapi-update
+# openvswitch-xapi-update
 #
 # chkconfig: 2345 95 01
-# description: Update vswitch configuration from XAPI database at boot
+# description: Update Open vSwitch configuration from XAPI database at boot
 
-# Copyright (C) 2009 Nicira Networks, Inc.
+# Copyright (C) 2009, 2010 Nicira Networks, Inc.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -22,12 +22,12 @@
 . /etc/init.d/functions
 
 function do_host_call {
-    xe host-call-plugin host-uuid="$INSTALLATION_UUID" plugin="vswitch-cfg-update" fn="update" >/dev/null
+    xe host-call-plugin host-uuid="$INSTALLATION_UUID" plugin="openvswitch-cfg-update" fn="update" >/dev/null
 }
 
 function start {
     if [ ! -f /etc/xensource-inventory ]; then
-        printf "vswitch-xapi-update ERROR: XenSource inventory not present in /etc/xensource-inventory\n"
+        printf "openvswitch-xapi-update ERROR: XenSource inventory not present in /etc/xensource-inventory\n"
         exit 1
     fi
     source /etc/xensource-inventory
@@ -45,7 +45,7 @@ case "$1" in
         start
         ;;
     help)
-        printf "vswitch-xapi-update [start|stop|restart]\n"
+        printf "openvswitch-xapi-update [start|stop|restart]\n"
         ;;
     *)
         printf "Unknown command: $1\n"