summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorErmal <eri@pfsense.org>2011-07-11 21:32:30 +0000
committerErmal <eri@pfsense.org>2011-07-11 21:32:30 +0000
commit156ecb643549601762b63714079344806886d7a0 (patch)
tree9a9c8dc082fa0499ddb14c51fbcf0aafd62d2a46
parent514f63d122c60a74e6a131fe97208ccb58ed02f2 (diff)
downloadpfsense-156ecb643549601762b63714079344806886d7a0.zip
pfsense-156ecb643549601762b63714079344806886d7a0.tar.gz
Enable the pfsync checking unconditionally
-rw-r--r--etc/inc/interfaces.inc18
1 files changed, 8 insertions, 10 deletions
diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc
index f8a5eaf..9dac0aa 100644
--- a/etc/inc/interfaces.inc
+++ b/etc/inc/interfaces.inc
@@ -1682,17 +1682,15 @@ function interfaces_carp_setup() {
} else
$cmdchain->add(gettext("Bring up pfsync0"), "/sbin/ifconfig pfsync0 syncdev lo0 up", false);
- if ($g['booting']) {
- sleep(1);
+ sleep(1);
- /* XXX: Handle an issue with pfsync(4) and carp(4). In a cluster carp will come up before pfsync(4) has updated and so will cause issuese
- * for exiting sessions.
- */
- $i = 0;
- while (intval(trim(`/sbin/ifconfig pfsync0 | /usr/bin/grep 'syncok: 0' | /usr/bin/grep -v grep | /usr/bin/wc -l`)) == 0 && $i < 30) {
- $i++;
- sleep(1);
- }
+ /* XXX: Handle an issue with pfsync(4) and carp(4). In a cluster carp will come up before pfsync(4) has updated and so will cause issuese
+ * for exiting sessions.
+ */
+ $i = 0;
+ while (intval(trim(`/sbin/ifconfig pfsync0 | /usr/bin/grep 'syncok: 0' | /usr/bin/grep -v grep | /usr/bin/wc -l`)) == 0 && $i < 30) {
+ $i++;
+ sleep(1);
}
if($config['virtualip']['vip'])
OpenPOWER on IntegriCloud