From 6aed99d0f4bbab29bbc81dae8fcd468632590727 Mon Sep 17 00:00:00 2001
From: Scott Ullrich <sullrich@pfsense.org>
Date: Mon, 7 Jul 2008 23:15:03 +0000
Subject: [PATCH] Turn off CARPDEV.

---
 usr/local/www/interfaces.php     | 6 +++---
 usr/local/www/interfaces_wan.php | 6 +++---
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/usr/local/www/interfaces.php b/usr/local/www/interfaces.php
index 6c2f4f91c8..516ab1eae5 100755
--- a/usr/local/www/interfaces.php
+++ b/usr/local/www/interfaces.php
@@ -138,8 +138,8 @@ $pconfig['alias-subnet'] = $wancfg['alias-subnet'];
 if ($wancfg['ipaddr'] == "dhcp") {
 	$pconfig['type'] = "DHCP";
 } else if ($wancfg['ipaddr'] == "carpdev-dhcp") {
-	$pconfig['type'] = "CarpDEV-DHCP";
-	$pconfig['ipaddr'] = "";	    
+//	$pconfig['type'] = "CarpDEV-DHCP";
+//	$pconfig['ipaddr'] = "";	    
 } else if ($wancfg['ipaddr'] == "pppoe") {
 	$pconfig['type'] = "PPPoE";
 } else if ($wancfg['ipaddr'] == "pptp") {
@@ -697,7 +697,7 @@ function show_mon_config() {
                 <tr>
                   <td valign="middle" class="vncell"><strong>Type</strong></td>
                   <td class="vtable"> <select name="type" class="formselect" id="type" onchange="type_change()">
-                      <?php $opts = split(" ", "Static DHCP PPPoE PPTP CarpDEV-DHCP");
+                      <?php $opts = split(" ", "Static DHCP PPPoE PPTP");
 					  foreach ($opts as $opt): ?>
 	                      <option <?php if ($opt == $pconfig['type']) echo "selected";?>>
 	                      <?=htmlspecialchars($opt);?>
diff --git a/usr/local/www/interfaces_wan.php b/usr/local/www/interfaces_wan.php
index 6c2f4f91c8..516ab1eae5 100755
--- a/usr/local/www/interfaces_wan.php
+++ b/usr/local/www/interfaces_wan.php
@@ -138,8 +138,8 @@ $pconfig['alias-subnet'] = $wancfg['alias-subnet'];
 if ($wancfg['ipaddr'] == "dhcp") {
 	$pconfig['type'] = "DHCP";
 } else if ($wancfg['ipaddr'] == "carpdev-dhcp") {
-	$pconfig['type'] = "CarpDEV-DHCP";
-	$pconfig['ipaddr'] = "";	    
+//	$pconfig['type'] = "CarpDEV-DHCP";
+//	$pconfig['ipaddr'] = "";	    
 } else if ($wancfg['ipaddr'] == "pppoe") {
 	$pconfig['type'] = "PPPoE";
 } else if ($wancfg['ipaddr'] == "pptp") {
@@ -697,7 +697,7 @@ function show_mon_config() {
                 <tr>
                   <td valign="middle" class="vncell"><strong>Type</strong></td>
                   <td class="vtable"> <select name="type" class="formselect" id="type" onchange="type_change()">
-                      <?php $opts = split(" ", "Static DHCP PPPoE PPTP CarpDEV-DHCP");
+                      <?php $opts = split(" ", "Static DHCP PPPoE PPTP");
 					  foreach ($opts as $opt): ?>
 	                      <option <?php if ($opt == $pconfig['type']) echo "selected";?>>
 	                      <?=htmlspecialchars($opt);?>