aboutsummaryrefslogtreecommitdiff
path: root/xenserver/etc_xensource_scripts_vif
diff options
context:
space:
mode:
authorJustin Pettit <jpettit@nicira.com>2010-03-02 00:15:40 -0800
committerJustin Pettit <jpettit@nicira.com>2010-03-02 00:28:13 -0800
commit3612b72c3639f22b33786c2fac3fb291ff9f6061 (patch)
treed1c24c13dc01451f85482bd0e068d447ce47e2aa /xenserver/etc_xensource_scripts_vif
parent7aee8e5a0a2f69fc3e12362c75e18a2f59fb99d9 (diff)
xenserver: Various fixes for vif script
Diffstat (limited to 'xenserver/etc_xensource_scripts_vif')
-rwxr-xr-xxenserver/etc_xensource_scripts_vif6
1 files changed, 3 insertions, 3 deletions
diff --git a/xenserver/etc_xensource_scripts_vif b/xenserver/etc_xensource_scripts_vif
index c81358a2c..77d394004 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
}