From 4b54648ce2957f38c04904d9346d6289f333d3f3 Mon Sep 17 00:00:00 2001
From: Scott Ullrich <sullrich@pfsense.org>
Date: Sat, 18 Dec 2010 18:05:42 -0500
Subject: Rename conf to x counter

---
 usr/local/www/installer/installer.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'usr/local')

diff --git a/usr/local/www/installer/installer.php b/usr/local/www/installer/installer.php
index 151095e..b1f991e 100644
--- a/usr/local/www/installer/installer.php
+++ b/usr/local/www/installer/installer.php
@@ -448,8 +448,8 @@ function verify_before_install() {
 		if($_REQUEST['fstype'] <> "SWAP") {
 			$tmparray['mountpoint'] = $_REQUEST['mountpoint' . $x];
 			if($tmparray['mountpoint'] == "/conf") {	
-				$tmparray['mountpoint'] = "/confa";
-				$error_txt = "<center><font color='red'>/conf is not an allowed mount point and has been renamed.</font></center><br/>";
+				$tmparray['mountpoint'] = "/conf{$x}";
+				$error_txt .= "<center><font color='red'>/conf is not an allowed mount point and has been renamed to /conf{$x}.</font></center><br/>";
 			}
 		} else  {
 			$tmparray['mountpoint'] = "none";
-- 
cgit v1.1