diff options
| author | Jesse Gross <jesse@nicira.com> | 2009-11-11 14:48:48 -0800 |
|---|---|---|
| committer | Jesse Gross <jesse@nicira.com> | 2009-11-11 16:00:05 -0800 |
| commit | 42061b2a5b79d44c0ff9442a8203f0c7672ee9cf (patch) | |
| tree | e7aeffb0259da9fa04fb0ea143c2569c64d4f808 /xenserver/etc_xensource_scripts_vif | |
| parent | e96a4d8035367297f1d19a70e59976a20bf72517 (diff) | |
| download | openvswitch-42061b2a5b79d44c0ff9442a8203f0c7672ee9cf.tar.gz | |
mirroring: Preserve key for disabling learning.
Don't delete the key for disabling MAC learning on a given VLAN
after a reboot. Also logs when learning is disabled.
Diffstat (limited to 'xenserver/etc_xensource_scripts_vif')
| -rwxr-xr-x | xenserver/etc_xensource_scripts_vif | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/xenserver/etc_xensource_scripts_vif b/xenserver/etc_xensource_scripts_vif index 8217fb00c..572f5af0c 100755 --- a/xenserver/etc_xensource_scripts_vif +++ b/xenserver/etc_xensource_scripts_vif @@ -92,7 +92,8 @@ add_to_bridge() $cfg_mod -F /etc/ovs-vswitchd.conf \ --del-match="bridge.*.port=$vif" \ - --del-match="vlan.$vif.[!0-9]*" \ + --del-match="vlan.$vif.trunks=*" \ + --del-match="vlan.$vif.tag=*" \ --del-match="port.$vif.[!0-9]*" \ --add="bridge.$bridge.port=$vif" \ $vid $vif_details -c @@ -128,7 +129,8 @@ remove) logger -t scripts-vif "${vif} has been removed" $cfg_mod -vANY:console:emer -F /etc/ovs-vswitchd.conf \ --del-match="bridge.*.port=${vif}" \ - --del-match="vlan.${vif}.[!0-9]*" \ + --del-match="vlan.${vif}.trunks=*" \ + --del-match="vlan.${vif}.tag=*" \ --del-match="port.${vif}.[!0-9]*" -c $service vswitch reload ;; |