summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Ullrich <sullrich@pfsense.org>2005-12-29 19:48:36 +0000
committerScott Ullrich <sullrich@pfsense.org>2005-12-29 19:48:36 +0000
commit7d0f4544d4835a43bb7d88bd6fa665f9cf102261 (patch)
tree716c2e84eacab4aa6117ce578183144d64652454
parent71bee4090283b0c1110cabcd695e60cc99e59b9f (diff)
downloadpfsense-7d0f4544d4835a43bb7d88bd6fa665f9cf102261.zip
pfsense-7d0f4544d4835a43bb7d88bd6fa665f9cf102261.tar.gz
Do not return so early so that pfsync gets redirected to loopback
Ticket #761
-rw-r--r--etc/inc/interfaces.inc12
1 files changed, 6 insertions, 6 deletions
diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc
index 80e21b4..104a36a 100644
--- a/etc/inc/interfaces.inc
+++ b/etc/inc/interfaces.inc
@@ -351,12 +351,6 @@ function interfaces_carp_configure() {
$mt = microtime();
echo "interfaces_carp_configure() being called $mt\n";
}
- if(!$config['installedpackages']['carpsettings']['config'])
- return;
- if ($g['booting'] and !$debugging) {
- echo "Configuring CARP interfaces...";
- mute_kernel_msgs();
- }
/* if neither items are arrays then redirect pfsync to loopback */
if (!is_array($config['virtualip']['vip']) or
!is_array($config['installedpackages']['carpsettings']['config'])) {
@@ -367,6 +361,12 @@ function interfaces_carp_configure() {
}
return;
}
+ if(!$config['installedpackages']['carpsettings']['config'])
+ return;
+ if ($g['booting'] and !$debugging) {
+ echo "Configuring CARP interfaces...";
+ mute_kernel_msgs();
+ }
foreach($config['installedpackages']['carpsettings']['config'] as $carp) {
if($carp['pfsyncenabled'] != "") {
mwexec("/sbin/sysctl net.inet.carp.allow=1");
OpenPOWER on IntegriCloud