From 00abad24509e60bdc5904becc5c7e678c1007daa Mon Sep 17 00:00:00 2001
From: Scott Ullrich <sullrich@su.local>
Date: Sat, 29 Aug 2009 18:01:14 -0400
Subject: Turn off auto assignment of interfaces code until the author can fix
 its issues

---
 etc/inc/config.inc | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/etc/inc/config.inc b/etc/inc/config.inc
index 8a48d23..b0720e5 100644
--- a/etc/inc/config.inc
+++ b/etc/inc/config.inc
@@ -797,7 +797,7 @@ function set_networking_interfaces_ports() {
 
 /* Only present auto interface option if running from LiveCD and interface mismatch*/
 	if ((ereg("cdrom", $g['platform'])) && is_interface_mismatch())
-		$auto_assign = true;
+		$auto_assign = false;
 
 	echo <<<EOD
 
@@ -827,11 +827,12 @@ EOD;
 	
 	echo <<<EOD
 
-Do you want to set up VLANs first?
+Do you want to set up VLANs first? 
+
 If you are not going to use VLANs, or only for optional interfaces, you should
 say no here and use the webConfigurator to configure VLANs later, if required.
 
-Do you want to set up VLANs now [y|n]?
+Do you want to set up VLANs now [y|n]? 
 EOD;
 
 	if ($auto_assign) {
@@ -840,7 +841,7 @@ EOD;
 	} else
 		$key = chop(fgets($fp));
 
-	if (!isset($key)) {	// Auto Assign Interfaces
+	if (!isset($key) and $auto_assign) {	// Auto Assign Interfaces
 		do {
 			echo <<<EOD
 
-- 
cgit v1.1