[ovs-dev] [PATCH] xenserver: Various fixes for vif script

Justin Pettit jpettit at nicira.com
Tue Mar 2 08:17:40 UTC 2010


---
 xenserver/etc_xensource_scripts_vif |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/xenserver/etc_xensource_scripts_vif b/xenserver/etc_xensource_scripts_vif
index c81358a..f2fd632 100755
--- a/xenserver/etc_xensource_scripts_vif
+++ b/xenserver/etc_xensource_scripts_vif
@@ -120,7 +120,7 @@ xs550_set_internal_network_uuid()
         local net_uuid=$(xenstore-read "${PRIVATE}/network-uuid" 2>/dev/null)
         if [ -n "${net_uuid}" ] ; then
             logger -t scripts-vif "${bridge} xs-network-uuids ${net_uuid}"
-            echo "-- br-set-external-id \"$bridge\" xs-network-uuids \"${net_uuid}\""
+            echo "-- br-set-external-id $bridge xs-network-uuids \"${net_uuid}\""
         fi
     else
         # XAPI after 5.5.0 sets the network external ids itself, via ovs-vsctl.
@@ -158,7 +158,7 @@ add_to_bridge()
 		local vif_details=$(handle_vswitch_vif_details)
 	    fi
 
-	    $vsctl -- --if-exists del-port $dev -- add-port $bridge $dev $vif_details $(xs550_set_internal_network_uuid)
+	    $vsctl -- --if-exists del-port $dev -- add-port $bridge $dev $vif_details $(xs550_set_internal_network_uuid $bridge)
 	    ;;
     esac
 	    
@@ -172,7 +172,7 @@ remove_from_bridge()
 	    # Nothing to do
 	    ;;
 	vswitch)
-	    $vsctl del-port $bridge $dev
+	    $vsctl del-port $dev
 	    ;;
     esac
 }
-- 
1.6.5.5





More information about the dev mailing list