From b8791a3151c93c05261933c52f19f8a531491c65 Mon Sep 17 00:00:00 2001
From: Scott Ullrich <sullrich@pfsense.org>
Date: Sat, 18 Dec 2010 16:43:32 -0500
Subject: Restore encpass as well

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

(limited to 'usr')

diff --git a/usr/local/www/installer/installer.php b/usr/local/www/installer/installer.php
index b59259a..281cfd0 100644
--- a/usr/local/www/installer/installer.php
+++ b/usr/local/www/installer/installer.php
@@ -770,14 +770,14 @@ EOF;
 		if(file_exists("/tmp/webInstaller_disk_layout.txt")) {
 			$disks_restored = unserialize(file_get_contents("/tmp/webInstaller_disk_layout.txt"));
 			$restored_layout_from_file = true;
-			$restored_layout_txt = "The previous disk layout was restored from disk";
+			$restored_layout_txt = "<br/>* The previous disk layout was restored from disk";
 		}
 
 		// If we restored disk layout(s) from a file then build the rows
 		if($restored_layout_from_file == true) {
 			$diskcounter = 0;
 			foreach($disks_restored as $dr) {
-				$custom_txt .= return_rowhelper_row("$diskcounter", $dr['mountpoint'], $dr['fstype'], $dr['disk'], $dr['size'], "");
+				$custom_txt .= return_rowhelper_row("$diskcounter", $dr['mountpoint'], $dr['fstype'], $dr['disk'], $dr['size'], $dr['encpass']);
 				$diskcounter++;
 			}
 		} else {		
@@ -833,6 +833,7 @@ EOF;
 									</span>
 									<br/>* Sizes are in megabytes.
 									<br/>* Encryption password field should only be used if a encrypted filesystem (.eli) was chosen
+									{$restored_layout_txt}
 								</span>
 								</strong>
 							</div>
-- 
cgit v1.1