From 549b7ce250b5d2faf4f4d9ea414ff0f23d3685fe Mon Sep 17 00:00:00 2001 From: Chris Buechler Date: Sat, 26 Apr 2014 17:20:32 -0500 Subject: Don't refuse to delete a bridge in the GUI just because its bridge interface doesn't exist, just log that it doesn't exist and don't attempt to ifconfig destroy it, delete it from config --- usr/local/www/interfaces_bridge.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'usr/local/www') diff --git a/usr/local/www/interfaces_bridge.php b/usr/local/www/interfaces_bridge.php index 1a7f556..d41ae44 100644 --- a/usr/local/www/interfaces_bridge.php +++ b/usr/local/www/interfaces_bridge.php @@ -66,10 +66,13 @@ if ($_GET['act'] == "del") { /* check if still in use */ else if (bridge_inuse($_GET['id'])) { $input_errors[] = gettext("This bridge cannot be deleted because it is assigned as an interface."); - } elseif (!does_interface_exist($a_bridges[$_GET['id']]['bridgeif'])) { - $input_errors[] = gettext("Invalid bridge interface."); } else { - mwexec("/sbin/ifconfig " . $a_bridges[$_GET['id']]['bridgeif'] . " destroy"); + if (!does_interface_exist($a_bridges[$_GET['id']]['bridgeif'])) { + log_error("Bridge interface does not exist, skipping ifconfig destroy."); + } else { + mwexec("/sbin/ifconfig " . $a_bridges[$_GET['id']]['bridgeif'] . " destroy"); + } + unset($a_bridges[$_GET['id']]); write_config(); -- cgit v1.1