projects
/
openvswitch
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ovsdb: Correct specification inconsistency between "lock" and "assert".
[openvswitch]
/
xenserver
/
etc_xensource_scripts_vif
diff --git
a/xenserver/etc_xensource_scripts_vif
b/xenserver/etc_xensource_scripts_vif
index 5675cdfe83b0dfc8d968d3221e4ebb54bd2c70a0..062549862e3f3e0628cd54d28f27bbcbaa8a9df8 100755
(executable)
--- a/
xenserver/etc_xensource_scripts_vif
+++ b/
xenserver/etc_xensource_scripts_vif
@@
-145,10
+145,7
@@
remove_from_bridge()
# Nothing to do
;;
openvswitch)
# Nothing to do
;;
openvswitch)
- # If ovs-brcompatd is running, it might already have deleted the
- # port. Use --if-exists to suppress the error that would otherwise
- # arise in that case.
- $vsctl --timeout=30 -- --if-exists del-port $dev
+ $vsctl --timeout=30 -- del-port $dev
;;
esac
}
;;
esac
}