summaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorChris Buechler <cmb@pfsense.org>2016-01-26 00:21:02 -0600
committerChris Buechler <cmb@pfsense.org>2016-01-26 00:21:02 -0600
commitc7474afc86d72e59266771e0c0f3bc5d5de33229 (patch)
tree05272bee63adb7957c45ee3838955ff4c2c5eaaf /src
parent95246771795115e0c95c4e567c1a87a901e681bd (diff)
downloadpfsense-c7474afc86d72e59266771e0c0f3bc5d5de33229.zip
pfsense-c7474afc86d72e59266771e0c0f3bc5d5de33229.tar.gz
handle bridge interface IPs so they don't get added in the wrong order. Matches behavior to what "apply changes" on interfaces.php does. Ticket #3997
Diffstat (limited to 'src')
-rw-r--r--src/etc/inc/interfaces.inc5
1 files changed, 4 insertions, 1 deletions
diff --git a/src/etc/inc/interfaces.inc b/src/etc/inc/interfaces.inc
index 71c98c3..29ae6b3 100644
--- a/src/etc/inc/interfaces.inc
+++ b/src/etc/inc/interfaces.inc
@@ -1132,7 +1132,10 @@ function interfaces_configure() {
log_error(sprintf(gettext("Configuring %s"), $ifname));
}
- interface_configure($if, $reload);
+ // bridge interface needs reconfigure, then re-add VIPs, to ensure find_interface_ip is correct.
+ // redmine #3997
+ interface_reconfigure($if, $reload);
+ interfaces_vips_configure($if);
if (platform_booting()) {
echo gettext("done.") . "\n";
OpenPOWER on IntegriCloud