network: Add some more checks if detatching a device from a bridge.

[people/arne_f/network.git] / functions.bridge

diff --git a/functions.bridge b/functions.bridge
index 4a32789652a4fff329ee240c0b39ad43c6201f38..edf54be96800da84dcfe4c96c7e64a6d1267c53b 100644 (file)
--- a/functions.bridge
+++ b/functions.bridge
@@ -52,8 +52,12 @@ function bridge_detach_device() {
        fi
 
        if ! device_exists ${device}; then
-               error "Device '${device}' does not exist."
-               return ${EXIT_ERROR}
+               return ${EXIT_OK}
+       fi
+
+       # If device is not attached, exit silently
+       if ! listmatch ${device} $(bridge_get_members ${bridge}); then
+               return ${EXIT_OK}
        fi
 
        log INFO "Detaching device '${device}' from bridge '${bridge}'."