diff options
author | Chris Buechler <cmb@pfsense.org> | 2016-01-23 05:33:42 -0600 |
---|---|---|
committer | Chris Buechler <cmb@pfsense.org> | 2016-01-23 05:33:42 -0600 |
commit | 617daf5e38cefcad2d2f0ac4308f034131be31b7 (patch) | |
tree | 785a8b248b31a709908016a91acecc8fec85cab8 | |
parent | d9a17eafb69f02a85f7cd3c3060d137cdc95f70e (diff) | |
download | pfsense-617daf5e38cefcad2d2f0ac4308f034131be31b7.zip pfsense-617daf5e38cefcad2d2f0ac4308f034131be31b7.tar.gz |
interface_bridge_add_member is inadequate for adding a bridge member that may have not existed at the time of bridge interface's creation. interface_bridge_configure on the interface's bridge ensures all settings (private, etc.) are applied. Ticket #4312
-rwxr-xr-x | src/etc/rc.newwanip | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/src/etc/rc.newwanip b/src/etc/rc.newwanip index 45cef96..bfbe78b 100755 --- a/src/etc/rc.newwanip +++ b/src/etc/rc.newwanip @@ -150,7 +150,13 @@ if (!empty($grouptmp)) { unset($bridgetmp); $bridgetmp = link_interface_to_bridge($interface); if (!empty($bridgetmp)) { - interface_bridge_add_member($bridgetmp, $interface_real); + if (is_array($config['bridges']['bridged']) && count($config['bridges']['bridged'])) { + foreach ($config['bridges']['bridged'] as $bridge) { + if ($bridge['bridgeif'] == $bridgetmp) { + interface_bridge_configure($bridge); + } + } + } } // Do not process while booting |