From 274222769acb1b90d3465a4b8bcab0f1688ff0b5 Mon Sep 17 00:00:00 2001 From: Rohit Yadav Date: Fri, 22 May 2015 13:22:40 +0100 Subject: [PATCH] CLOUDSTACK-8252: Ignore VLAN 4095 which is n/a on linux VLAN id 4095 is commonly used as a 'tag passthrough' in virtualization environments (VMware, specifically). This vlan id is incompatible with Linux, but we can allow the admin to manually configure the bridge if the same passthrough is desired. Signed-off-by: Rohit Yadav (cherry picked from commit aee35c96a8157e36b1237dc537bb5b01e1657d61) Signed-off-by: Rohit Yadav --- scripts/vm/network/vnet/modifyvlan.sh | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/scripts/vm/network/vnet/modifyvlan.sh b/scripts/vm/network/vnet/modifyvlan.sh index 021dfa20a0e..24a38a18050 100755 --- a/scripts/vm/network/vnet/modifyvlan.sh +++ b/scripts/vm/network/vnet/modifyvlan.sh @@ -167,6 +167,11 @@ then modprobe 8021q >& /dev/null fi +if [ "$vlanId" -eq 4095 ] +then + exit 0 +fi + if [ "$op" == "add" ] then # Add the vlan