From 3612b72c3639f22b33786c2fac3fb291ff9f6061 Mon Sep 17 00:00:00 2001 From: Justin Pettit Date: Tue, 2 Mar 2010 00:15:40 -0800 Subject: [PATCH] xenserver: Various fixes for vif script --- xenserver/etc_xensource_scripts_vif | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/xenserver/etc_xensource_scripts_vif b/xenserver/etc_xensource_scripts_vif index c81358a2..77d39400 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 } -- 2.30.2