From: Jesse Gross <jesse@nicira.com>
Date: Tue, 20 Oct 2009 01:40:11 +0000 (-0700)
Subject: xen: Correctly write VLAN key in config file.
X-Git-Tag: v0.99.0~51
X-Git-Url: http://git.cascardo.info/?a=commitdiff_plain;h=adea354e28134f08008732062ef0c613954dc7e4;p=cascardo%2Fovs.git

xen: Correctly write VLAN key in config file.

When adding the VLAN key the name of the vif was from a variable in
use on only the xs5.7 branch.  This uses the correct variable name
for the master branch
---

diff --git a/xenserver/etc_xensource_scripts_vif b/xenserver/etc_xensource_scripts_vif
index dc9cb7b77..2fcf9d402 100755
--- a/xenserver/etc_xensource_scripts_vif
+++ b/xenserver/etc_xensource_scripts_vif
@@ -75,7 +75,7 @@ add_to_bridge()
     local vid=
     if [ "$VLAN_ID" -ne 0 ] ; then
 	bridge=$($vsctl br-to-parent $bridge)
-	vid="--add=vlan.${dev}.tag=${VLAN_ID}"
+	vid="--add=vlan.${vif}.tag=${VLAN_ID}"
     fi
 
     ${IP} link set "${vif}" down                        || logger -t scripts-vif "Failed to ip link set ${vif} down"