diff options
| author | Scott Ullrich <sullrich@pfsense.org> | 2006-01-23 18:53:02 +0000 |
|---|---|---|
| committer | Scott Ullrich <sullrich@pfsense.org> | 2006-01-23 18:53:02 +0000 |
| commit | c46e94b059f2e5bdb8fb4c5cd41a18c1eb16b8f5 (patch) | |
| tree | 6a74d033b77bb2f59d84a71f48a612e313fd5a90 /etc/inc/interfaces.inc | |
| parent | a83351369a232a8d24d0eebcd2e5ed65a3a26029 (diff) | |
| download | pfsense-c46e94b059f2e5bdb8fb4c5cd41a18c1eb16b8f5.zip pfsense-c46e94b059f2e5bdb8fb4c5cd41a18c1eb16b8f5.tar.gz | |
Remove CARP preemption from RELENG_1. Option will stay in HEAD and will need to be fixed but #797 is now fixed for RELENG_1
In-discussion-with: Bill M
Huge-issues-found-by: Tmueko
Diffstat (limited to 'etc/inc/interfaces.inc')
| -rw-r--r-- | etc/inc/interfaces.inc | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc index 228ee40..b9f10bd 100644 --- a/etc/inc/interfaces.inc +++ b/etc/inc/interfaces.inc @@ -371,10 +371,7 @@ function interfaces_carp_configure() { foreach($config['installedpackages']['carpsettings']['config'] as $carp) { if($carp['pfsyncenabled'] != "") { mwexec("/sbin/sysctl net.inet.carp.allow=1"); - if($debugging) - echo "Enabling preempt\n"; - if($carp['premption'] != "") - mwexec("/sbin/sysctl net.inet.carp.preempt=1"); + mwexec("/sbin/sysctl net.inet.carp.preempt=1"); if($carp['balancing'] != "") mwexec("/sbin/sysctl net.inet.carp.arpbalance=1"); if($debugging) |
