diff options
| author | Ermal <eri@pfsense.org> | 2011-04-22 18:28:01 +0000 |
|---|---|---|
| committer | Ermal <eri@pfsense.org> | 2011-04-22 18:28:01 +0000 |
| commit | bce14123ad331f1f321aeb87d9c71c8052c2071f (patch) | |
| tree | cc5bd91e1b1df40c4ee81759b368d1d8891e0b90 /etc | |
| parent | d8da6350bc7d642c92e121aca469f36c61875194 (diff) | |
| download | pfsense-bce14123ad331f1f321aeb87d9c71c8052c2071f.zip pfsense-bce14123ad331f1f321aeb87d9c71c8052c2071f.tar.gz | |
Actually call interfaces_carp_setup after the carp interfaces are created so carp traffic can only flow after we have all vips up and running. This prevents premption more early than necessary. Ticket #1432.
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/inc/interfaces.inc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc index 0e101d1..1ed6839 100644 --- a/etc/inc/interfaces.inc +++ b/etc/inc/interfaces.inc @@ -1578,7 +1578,6 @@ function interfaces_carp_setup() { unset($pfsyncenabled); } - $cmdchain->add("Allow CARP", "/sbin/sysctl net.inet.carp.allow=1", true); if($balanacing) { $cmdchain->add("Enable CARP ARP-balancing", "/sbin/sysctl net.inet.carp.arpbalance=1", true); $cmdchain->add("Disallow CARP preemption", "/sbin/sysctl net.inet.carp.preempt=0", true); @@ -1725,10 +1724,8 @@ function interfaces_vips_configure($interface = "") { case "carp": if ($interface <> "" && $vip['interface'] <> $interface) continue; - if ($carp_setuped == false) { - interfaces_carp_setup(); + if ($carp_setuped == false) $carp_setuped = true; - } interface_carp_configure($vip); break; case "carpdev-dhcp": @@ -1738,7 +1735,8 @@ function interfaces_vips_configure($interface = "") { break; } } - + if ($carp_setuped == true) + interfaces_carp_setup(); if ($anyproxyarp == true) interface_proxyarp_configure(); } |
