xenserver: Suppress error message for expected non-error condition.
authorBen Pfaff <blp@nicira.com>
Tue, 2 Mar 2010 21:52:33 +0000 (13:52 -0800)
committerBen Pfaff <blp@nicira.com>
Wed, 3 Mar 2010 17:55:33 +0000 (09:55 -0800)
Signed-off-by: Ben Pfaff <blp@nicira.com>
xenserver/etc_xensource_scripts_vif

index 77d39400476e6de0c419dcbcacebef23c1833ce9..3a209f9b4ae315d732483d0d6fb8f9f4eb1323d5 100755 (executable)
@@ -172,7 +172,10 @@ remove_from_bridge()
            # Nothing to do
            ;;
        vswitch)
-           $vsctl del-port $dev
+            # 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 -- --if-exists del-port $dev
            ;;
     esac
 }