From: Justin Pettit Date: Thu, 8 Jul 2010 13:31:24 +0000 (+0100) Subject: [PATCH] xenserver: Various fixes for vif script X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=bb255f67fbc1f788615353c3ccf93f424e239049;p=xcp%2Fxen-api.git [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 --- scripts/vif | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) --- diff --git a/scripts/vif b/scripts/vif index c81358a2..77d39400 100755 --- a/scripts/vif +++ b/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 }