diff options
author | Chris Buechler <cmb@pfsense.org> | 2014-04-26 17:20:32 -0500 |
---|---|---|
committer | Chris Buechler <cmb@pfsense.org> | 2014-04-26 17:21:11 -0500 |
commit | a5303b6e0e8373a9b10b19715e3189216ea3e37a (patch) | |
tree | 0c7e521c46387ae96be4eedc0b81d81b5da824c7 | |
parent | b2e2c6bc7fc67d9edbd2083773ff0835ba7475bc (diff) | |
download | pfsense-a5303b6e0e8373a9b10b19715e3189216ea3e37a.zip pfsense-a5303b6e0e8373a9b10b19715e3189216ea3e37a.tar.gz |
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
-rw-r--r-- | usr/local/www/interfaces_bridge.php | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/usr/local/www/interfaces_bridge.php b/usr/local/www/interfaces_bridge.php index 75eed02..b6a6db7 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(); |