diff options
| author | Bill Marquette <billm@pfsense.org> | 2005-04-16 21:14:26 +0000 |
|---|---|---|
| committer | Bill Marquette <billm@pfsense.org> | 2005-04-16 21:14:26 +0000 |
| commit | 0a46997adc0ee8712dd22e1214aa7d2a1e40b696 (patch) | |
| tree | 37efc33151e5cf55fee7a65110b4d3a24d27cbc0 | |
| parent | 93731e27e160b77de780f54b8122bd0b24c86213 (diff) | |
| download | pfsense-packages-0a46997adc0ee8712dd22e1214aa7d2a1e40b696.tar.gz pfsense-packages-0a46997adc0ee8712dd22e1214aa7d2a1e40b696.tar.bz2 pfsense-packages-0a46997adc0ee8712dd22e1214aa7d2a1e40b696.zip | |
minor cleanup - move sysctl's into carp.sh
| -rw-r--r-- | packages/carp.xml | 11 |
1 files changed, 3 insertions, 8 deletions
diff --git a/packages/carp.xml b/packages/carp.xml index 5b79608a..e7f10f32 100644 --- a/packages/carp.xml +++ b/packages/carp.xml @@ -227,9 +227,9 @@ if($carp['pfsyncenabled'] != "") { $pfsync = 1; if($carp['premption'] != "") - $preempt = 1; + fwrite($fout, "sysctl net.inet.carp.preempt=1\n"); if($carp['balancing'] != "") - $using_arp_balance = 1; + fwrite($fout, "sysctl net.inet.arpbalance=1\n"); $carp_sync_int = convert_friendly_interface_to_real_interface_name($carp['pfsyncinterface']); fwrite($fout, "/sbin/ifconfig pfsync0 create\n"); fwrite($fout, "/sbin/ifconfig pfsync0 syncif " . $carp_sync_int . "\n"); @@ -250,11 +250,8 @@ } $carp_command = "/sbin/ifconfig carp" . $carp_instances_counter . " " . $carp['ipaddress'] . "/" . $carp['netmask']; $carp_command .= " broadcast " . $broadcast_address . " vhid " . $carp['vhid'] . " advskew " . $carp['advskew'] . $password; - if($carp['balancing'] == "true") $using_arp_balance = 1; - if($carp['preempt'] == "true") $using_preempt = 1; fwrite($fout, $carp_command . "\n"); fwrite($fout, "/sbin/ifconfig carp{$carp_instances_counter} up\n"); - if($carp['pfsync'] != "") $pfsync = 1; $carp_instances_counter++; } } @@ -262,8 +259,6 @@ fclose($fout); chmod("/usr/local/pkg/pf/carp.sh", 0755); mwexec("/usr/local/pkg/pf/carp.sh"); - if($using_arp_balance == 1) mwexec("sysctl net.inet.arpbalance=1"); - if($preempt == 1) mwexec("sysctl net.inet.carp.preempt=1"); conf_mount_ro(); config_unlock(); } @@ -281,4 +276,4 @@ unlink_if_exists("/usr/local/etc/rc.d/carp*"); unlink_if_exists("/usr/local/pkg/pf/carp*"); </custom_php_deinstall_command> -</packagegui>
\ No newline at end of file +</packagegui> |