xenserver: Fix VIF script to work with XenServer 5.5

[openvswitch] / xenserver / etc_init.d_vswitch

diff --git a/xenserver/etc_init.d_vswitch b/xenserver/etc_init.d_vswitch
index 09f5d79187702b52a13aee7488cb487c44c3a764..c8172c819485ffeb64f54f0e517c043f6718465d 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
@@ -313,8 +314,8 @@ case "$1" in
         strace -p $(cat "$BRCOMPATD_PIDFILE") "$@"
         ;;
     status)
-        status -p ovs-vswitchd.pid ovs-vswitchd
-        status -p ovs-brcompatd.pid ovs-brcompatd
+        status -p "$VSWITCHD_PIDFILE" ovs-vswitchd
+        status -p "$BRCOMPATD_PIDFILE" ovs-brcompatd
         ;;
     version)
         /usr/sbin/ovs-vswitchd -V