From 4f9a78d93e996f5b9a6d6e9dd74d1034e364beff Mon Sep 17 00:00:00 2001 From: Scott Ullrich Date: Wed, 12 Oct 2005 23:33:27 +0000 Subject: Do not call ifconfig on non-existant interfaces when testing --- etc/inc/interfaces.inc | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'etc/inc') diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc index 5a6e99e..c8b5222 100644 --- a/etc/inc/interfaces.inc +++ b/etc/inc/interfaces.inc @@ -1311,9 +1311,12 @@ function destroy_bridge($bridge_num) { function discover_bridge($interface1, $interface2) { $total_bridges = get_number_of_bridged_interfaces(); + $interfaces = `/sbin/ifconfig -l`; $x=0; for($x=0; $x<$total_bridges; $x++) { - $bridge_text = `/sbin/ifconfig bridge{$x} | grep member`; + $bridge_text = "NA"; + if(!stristr($interfaces, "bridge{$x}")) { + $bridge_text = `/sbin/ifconfig bridge{$x} | grep member`; if(stristr($bridge_text, $interface1) == true and stristr($bridge_text, $interface2) == true) { return "{$x}"; -- cgit v1.1