From c46e94b059f2e5bdb8fb4c5cd41a18c1eb16b8f5 Mon Sep 17 00:00:00 2001 From: Scott Ullrich Date: Mon, 23 Jan 2006 18:53:02 +0000 Subject: 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 --- etc/inc/interfaces.inc | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) (limited to 'etc/inc/interfaces.inc') 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) -- cgit v1.1