From 6d9d84fa831d6881559631b7bc76fe2fb42ae5b7 Mon Sep 17 00:00:00 2001 From: Scott Ullrich Date: Fri, 6 May 2005 00:07:22 +0000 Subject: Do not generate carp.sh .. this is now handled in base --- packages/carp.xml | 54 ------------------------------------------------------ 1 file changed, 54 deletions(-) diff --git a/packages/carp.xml b/packages/carp.xml index b6a44fb3..1ae3d2c4 100644 --- a/packages/carp.xml +++ b/packages/carp.xml @@ -204,60 +204,6 @@ - function sync_package_carp() { - /* - * XXX: find out how many carp and pfsync interfaces are established - * and destroy/down them before sweeping through the list - */ - conf_mount_rw(); - config_lock(); - unlink_if_exists("/usr/local/etc/rc.d/carp.sh"); - $fout = fopen("/usr/local/pkg/pf/carp.sh","w"); - fwrite($fout, "#!/bin/sh \n"); - global $config; - $carp_instances_counter = 0; - $pfsync_instances_counter = 0; - if($config['installedpackages']['carpsettings']['config'] != "") { - foreach($config['installedpackages']['carpsettings']['config'] as $carp) - if($carp['pfsyncenabled'] != "") { - $pfsync = 1; - if($carp['premption'] != "") - fwrite($fout, "/sbin/sysctl net.inet.carp.preempt=1\n"); - if($carp['balancing'] != "") - fwrite($fout, "/sbin/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 syncdev " . $carp_sync_int . "\n"); - fwrite($fout, "/sbin/ifconfig pfsync0 syncif " . $carp_sync_int . "\n"); - fwrite($fout, "/sbin/ifconfig {$carp_sync_int} up\n"); - fwrite($fout, "/sbin/ifconfig pfsync0 up\n"); - $pfsync_instances_counter++; - } - } - if($config['installedpackages']['carp']['config'] != "") { - foreach($config['installedpackages']['carp']['config'] as $carp) { - /* - * create the carp interface - */ - fwrite($fout, "echo Creating {$carp_instances_counter} ...\n"); - fwrite($fout, "/sbin/ifconfig carp" . $carp_instances_counter . " create\n"); - $broadcast_address = gen_subnet_max($carp['ipaddress'], $carp['netmask']); - if($carp['password'] != "") { - $password = " pass " . $carp['password']; - } - $carp_command = "/sbin/ifconfig carp" . $carp_instances_counter . " " . $carp['ipaddress'] . "/" . $carp['netmask']; - $carp_command .= " broadcast " . $broadcast_address . " vhid " . $carp['vhid'] . " advskew " . $carp['advskew'] . $password; - fwrite($fout, $carp_command . "\n"); - fwrite($fout, "/sbin/ifconfig carp{$carp_instances_counter} up\n"); - $carp_instances_counter++; - } - } - fclose($fout); - chmod("/usr/local/pkg/pf/carp.sh", 0755); - mwexec("/usr/local/pkg/pf/carp.sh"); - conf_mount_ro(); - config_unlock(); - } sync_package_carp(); -- cgit v1.2.3