summaryrefslogtreecommitdiffstats
path: root/etc
diff options
context:
space:
mode:
authorScott Ullrich <sullrich@pfsense.org>2006-02-15 19:20:20 +0000
committerScott Ullrich <sullrich@pfsense.org>2006-02-15 19:20:20 +0000
commita5250ebc11cdf4c1baabc4ff201d16e291ba1468 (patch)
tree167b498a8972441da285a5a2d7794858f2c12fef /etc
parent159207c26b67c6fb1a17e88a36343b59a3de7df2 (diff)
downloadpfsense-a5250ebc11cdf4c1baabc4ff201d16e291ba1468.zip
pfsense-a5250ebc11cdf4c1baabc4ff201d16e291ba1468.tar.gz
If carp ips are defined install them regardless of the settings
Diffstat (limited to 'etc')
-rw-r--r--etc/inc/interfaces.inc8
1 files changed, 4 insertions, 4 deletions
diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc
index ccc2bbf..7b67638 100644
--- a/etc/inc/interfaces.inc
+++ b/etc/inc/interfaces.inc
@@ -352,8 +352,7 @@ function interfaces_carp_configure() {
echo "interfaces_carp_configure() being called $mt\n";
}
/* if neither items are arrays then redirect pfsync to loopback */
- if (!is_array($config['virtualip']['vip']) or
- !is_array($config['installedpackages']['carpsettings']['config'])) {
+ if (!is_array($config['virtualip']['vip'])) {
mwexec("/sbin/ifconfig pfsync0 syncdev lo0 up");
mwexec("/sbin/sysctl net.inet.carp.allow=0");
if($g['booting']) {
@@ -367,11 +366,12 @@ function interfaces_carp_configure() {
if ($g['booting'] and !$debugging) {
echo "Configuring CARP interfaces...";
mute_kernel_msgs();
- }
+ }
+ /* enable carp preemption */
+ mwexec("/sbin/sysctl net.inet.carp.preempt=1");
foreach($config['installedpackages']['carpsettings']['config'] as $carp) {
if($carp['pfsyncenabled'] != "") {
mwexec("/sbin/sysctl net.inet.carp.allow=1");
- mwexec("/sbin/sysctl net.inet.carp.preempt=1");
if($carp['balancing'] != "")
mwexec("/sbin/sysctl net.inet.carp.arpbalance=1");
if($debugging)
OpenPOWER on IntegriCloud