diff options
| author | Scott Ullrich <sullrich@pfsense.org> | 2006-02-11 23:34:13 +0000 |
|---|---|---|
| committer | Scott Ullrich <sullrich@pfsense.org> | 2006-02-11 23:34:13 +0000 |
| commit | be606e9a1af0b788b2c26d59db06a800e0cb7ea1 (patch) | |
| tree | 23f6966a676bde912037b67f8080c3b89cebaa0d | |
| parent | 4d81dcc970670fc792bbe8c016f8ebc621f3641d (diff) | |
| download | pfsense-be606e9a1af0b788b2c26d59db06a800e0cb7ea1.zip pfsense-be606e9a1af0b788b2c26d59db06a800e0cb7ea1.tar.gz | |
* Missing \n
* Remove /* */ carpdev code, it will never make it into RELENG_1 anyways
| -rw-r--r-- | etc/inc/interfaces.inc | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/etc/inc/interfaces.inc b/etc/inc/interfaces.inc index de1863c..ccc2bbf 100644 --- a/etc/inc/interfaces.inc +++ b/etc/inc/interfaces.inc @@ -419,20 +419,13 @@ function interfaces_carp_configure() { $broadcast_address = gen_subnet_max($vip['subnet'], $vip['subnet_bits']); if($vip['password'] != "") $password = " pass " . $vip['password']; - /* XXX: billm - carpdev not in our build? - $carpdev = ""; - if(isset($vip['interface']) && ($vip['interface'] != "AUTO" && $vip['interface'] != "")) { - $ci = filter_opt_interface_to_real($vip['interface']); - $carpdev = " carpdev {$ci} "; - } - */ if($debugging) echo "Configuring carp{$carp_instances_counter}.\n"; fwrite($fd, "/sbin/ifconfig carp" . $carp_instances_counter . " " . $vip['subnet'] . "/" . $vip['subnet_bits'] . " broadcast " . $broadcast_address . " vhid " . $vip['vhid'] . "{$carpdev} advskew 200 " . $password . "\n"); mwexec("/sbin/ifconfig carp" . $carp_instances_counter . " " . $vip['subnet'] . "/" . $vip['subnet_bits'] . " broadcast " . $broadcast_address . " vhid " . $vip['vhid'] . "{$carpdev} advskew 200 " . $password); usleep(10); mwexec("/sbin/ifconfig carp" . $carp_instances_counter . " up"); - fwrite($fd, "/sbin/ifconfig carp" . $carp_instances_counter . " up"); + fwrite($fd, "/sbin/ifconfig carp" . $carp_instances_counter . " up\n"); $carp_instances_counter++; } } |
