diff options
| author | Ben Pfaff <blp@nicira.com> | 2009-11-18 14:14:29 -0800 |
|---|---|---|
| committer | Ben Pfaff <blp@nicira.com> | 2009-11-18 14:14:29 -0800 |
| commit | d17ee8689bff22541dccaa792b70a848641f3646 (patch) | |
| tree | cd5e8c939f4acc98695275590279b8bdf0d66b79 /xenserver/etc_xensource_scripts_vif | |
| parent | 7c9e113b712e72fcb4ccc6075da7334cb3391059 (diff) | |
| parent | 0cd8a05ec036ca8f950d4d4034a80bf485581b6a (diff) | |
Merge citrix branch into master.
Diffstat (limited to 'xenserver/etc_xensource_scripts_vif')
| -rwxr-xr-x | xenserver/etc_xensource_scripts_vif | 18 |
1 files changed, 15 insertions, 3 deletions
diff --git a/xenserver/etc_xensource_scripts_vif b/xenserver/etc_xensource_scripts_vif index 2fcf9d40..c649e926 100755 --- a/xenserver/etc_xensource_scripts_vif +++ b/xenserver/etc_xensource_scripts_vif @@ -1,7 +1,17 @@ #!/bin/sh -# Copyright (C) 2008,2009 Citrix Systems, Inc. All rights reserved. +# Copyright (C) 2008,2009 Citrix Systems, Inc. # Copyright (C) 2009 Nicira Networks, Inc. +# +# This program is free software; you can redistribute it and/or modify +# it under the terms of the GNU Lesser General Public License as published +# by the Free Software Foundation; version 2.1 only. with the special +# exception on linking described in file LICENSE. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Lesser General Public License for more details. # CA-23900: Warning: when VIFs are added to windows guests with PV drivers the backend vif device is registered, # unregistered and then registered again. This causes the udev event to fire twice and this script runs twice. @@ -91,7 +101,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 @@ -127,7 +138,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 ;; |