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 | |
| 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
| -rw-r--r-- | etc/inc/interfaces.inc | 5 | ||||
| -rw-r--r-- | usr/local/pkg/carp_settings.xml | 12 |
2 files changed, 1 insertions, 16 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) diff --git a/usr/local/pkg/carp_settings.xml b/usr/local/pkg/carp_settings.xml index d4fc9d6..791e78e 100644 --- a/usr/local/pkg/carp_settings.xml +++ b/usr/local/pkg/carp_settings.xml @@ -48,11 +48,6 @@ <fieldname>balancing</fieldname> <type>checkbox</type> </columnitem> - <columnitem> - <fielddescr>Preemption</fielddescr> - <fieldname>premption</fieldname> - <type>checkbox</type> - </columnitem> </adddeleteeditpagefields> <!-- fields gets invoked when the user adds or edits a item. the following items will be parsed and rendered for the user as a gui with input, and selectboxes. --> @@ -85,13 +80,6 @@ <type>checkbox</type> </field> <field> - <fielddescr>Preemption</fielddescr> - <fieldname>premption</fieldname> - <description>When preemption is enabled, each CARP host will look at the advskew (Advertising Frequency) parameter in the advertisements it receives from the master, to try to determine whether it can advertise more frequently. If so, it will begin advertising, and the current master, seeing that there is another host with a lower advskew, will bow out.</description> - <type>checkbox</type> - <value>true</value> - </field> - <field> <fielddescr>Synchronize rules</fielddescr> <fieldname>synchronizerules</fieldname> <description>When this option is enabled, this system will automatically sync the firewalls rules over to the other carp when changes are made..</description> |
