From 9c98515dddc41c7c481b0ccd03315243291e0295 Mon Sep 17 00:00:00 2001
From: Chris Buechler <cmb@pfsense.org>
Date: Mon, 18 Feb 2008 06:55:09 +0000
Subject: Partially fix assignment of only WAN at console interface assignment.

Single interface support
Appliance Project
---
 etc/inc/config.inc | 26 +++++++++++---------------
 1 file changed, 11 insertions(+), 15 deletions(-)

(limited to 'etc/inc/config.inc')

diff --git a/etc/inc/config.inc b/etc/inc/config.inc
index 8b89aff..e949ee0 100644
--- a/etc/inc/config.inc
+++ b/etc/inc/config.inc
@@ -1480,13 +1480,10 @@ EOD;
 	} while (!$wanif);
 
 	do {
-		echo "\nEnter the LAN interface name or 'a' for auto-detection: ";
+		echo "\nEnter the LAN interface name or 'a' for auto-detection \n" .
+			"(or nothing if finished): ";
 		$lanif = chop(fgets($fp));
-		if ($lanif === "") {
-			fclose($fp);
-			return;
-		}
-
+		
 		if($lanif == "exit") {
 			exit;
 		}
@@ -1494,7 +1491,10 @@ EOD;
 		if($lanif == "") {
 			if($g['minimum_nic_count'] < 2) {
 				unset($config['interfaces']['lan']);
-				break;			
+				break;	
+			} else {
+				fclose($fp);
+				return;
 			}
 		}
 
@@ -1559,15 +1559,11 @@ EOD;
 		}
 	}
 
-	echo <<<EOD
-
-The interfaces will be assigned as follows:
-
-LAN  -> {$lanif}
-WAN  -> {$wanif}
-
-EOD;
+	echo "The interfaces will be assigned as follows: \n\n";
 
+	if ($lanif != "")
+		echo "LAN  ->" . $lanif . "\n";
+	echo "WAN  ->" . $wanif . "\n";
 	for ($i = 0; $i < count($optif); $i++) {
 		echo "OPT" . ($i+1) . " -> " . $optif[$i] . "\n";
 	}
-- 
cgit v1.1