Project

General

Profile

« Previous | Next » 

Revision a5303b6e

Added by Chris Buechler about 11 years ago

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

View differences:

usr/local/www/interfaces_bridge.php
66 66 
	/* check if still in use */
67 67 
	else if (bridge_inuse($_GET['id'])) {
68 68 
		$input_errors[] = gettext("This bridge cannot be deleted because it is assigned as an interface.");
69 
	} elseif (!does_interface_exist($a_bridges[$_GET['id']]['bridgeif'])) {
70 
		$input_errors[] = gettext("Invalid bridge interface.");
71 69 
	} else {
72 
		mwexec("/sbin/ifconfig " . $a_bridges[$_GET['id']]['bridgeif'] . " destroy");
70 
		if (!does_interface_exist($a_bridges[$_GET['id']]['bridgeif'])) {
71 
			log_error("Bridge interface does not exist, skipping ifconfig destroy.");
72 
		} else {
73 
			mwexec("/sbin/ifconfig " . $a_bridges[$_GET['id']]['bridgeif'] . " destroy");
74 
		}
75
73 76 
		unset($a_bridges[$_GET['id']]);
74 77 

  		




  75
  78
  
    
		write_config();


  		












Also available in:  Unified diff