# HG changeset patch
# User Justin Pettit <jpettit@xxxxxxxxxx>
# Date 1278595884 -3600
# Node ID f0f9bfec4fe259e0f073a4bcd8bf091c2c6dc2f9
# Parent  fd0437f4359e47762e6d1712e2daa87a9e00c60e
[PATCH] xenserver: Various fixes for vif script

>From 3612b72c3639f22b33786c2fac3fb291ff9f6061 Mon Sep 17 00:00:00 2001
Date: Tue, 2 Mar 2010 00:15:40 -0800

Signed-off-by: Ian Campbell <ian.campbell@xxxxxxxxxx>
---
 scripts/vif |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff -r fd0437f4359e -r f0f9bfec4fe2 scripts/vif
--- a/scripts/vif	Thu Jul 08 14:30:23 2010 +0100
+++ b/scripts/vif	Thu Jul 08 14:31:24 2010 +0100
@@ -120,7 +120,7 @@
         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 @@
 		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 @@
 	    # Nothing to do
 	    ;;
 	vswitch)
-	    $vsctl del-port $bridge $dev
+	    $vsctl del-port $dev
 	    ;;
     esac
 }