diff options
| author | Chris Buechler <cmb@pfsense.org> | 2016-02-16 17:07:42 -0600 |
|---|---|---|
| committer | Chris Buechler <cmb@pfsense.org> | 2016-02-16 17:15:11 -0600 |
| commit | 04d11c09f7ab9d9c3673367361e2a33441fb91a9 (patch) | |
| tree | 7e4eed455d72648b1cedb6ae8f6ed7d24f641a61 /src/etc/inc/interfaces.inc | |
| parent | 4cfe84160ff7d8ef489a54b69c286434f3eecf99 (diff) | |
| download | pfsense-04d11c09f7ab9d9c3673367361e2a33441fb91a9.zip pfsense-04d11c09f7ab9d9c3673367361e2a33441fb91a9.tar.gz | |
Clean up logic here. It makes no sense to proceed if bridgeif isn't defined but platform_booting is true. In interfaces_bridge_configure before it gets to this point, it's setting bridgeif if it's not set, and doing so in a way that won't potentially create conflicting bridgeifs (which this removed code didn't).
Diffstat (limited to 'src/etc/inc/interfaces.inc')
| -rw-r--r-- | src/etc/inc/interfaces.inc | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/src/etc/inc/interfaces.inc b/src/etc/inc/interfaces.inc index a708f8c..575512e 100644 --- a/src/etc/inc/interfaces.inc +++ b/src/etc/inc/interfaces.inc @@ -520,13 +520,10 @@ function interface_bridge_configure(&$bridge, $checkmember = 0) { $smallermtu = 1500; } - if (platform_booting() || !empty($bridge['bridgeif'])) { + if (!empty($bridge['bridgeif'])) { pfSense_interface_destroy($bridge['bridgeif']); pfSense_interface_create($bridge['bridgeif']); $bridgeif = escapeshellarg($bridge['bridgeif']); - } else { - $bridgeif = pfSense_interface_create("bridge"); - $bridge['bridgeif'] = $bridgeif; } $bridgemtu = interface_find_child_cfgmtu($bridge['bridgeif']); |
