From: Michael Tremer <michael.tremer@ipfire.org>
Date: Sat, 10 Jul 2010 17:56:23 +0000 (+0200)
Subject: network: Add some more checks if detatching a device from a bridge.
X-Git-Tag: 001~55
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=000ec6d36e4b3bb90c9634157099404e80014553;p=network.git

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

diff --git a/functions.bridge b/functions.bridge
index 4a327896..edf54be9 100644
--- 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}'."