git://git.onelab.eu
/
sliver-openvswitch.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge citrix branch into master.
[sliver-openvswitch.git]
/
xenserver
/
etc_init.d_vswitch
diff --git
a/xenserver/etc_init.d_vswitch
b/xenserver/etc_init.d_vswitch
index
09f5d79
..
bd621c1
100755
(executable)
--- a/
xenserver/etc_init.d_vswitch
+++ b/
xenserver/etc_init.d_vswitch
@@
-268,7
+268,8
@@
function start {
'--del-match=port.*' \
'--del-match=bonding.*' \
'--del-match=iface.*' \
- '--del-match=vlan.*'
+ '--del-match=vlan.*.trunks=*' \
+ '--del-match=vlan.*.tag=*'
fi
start_vswitchd