summaryrefslogtreecommitdiffstats
path: root/usr
diff options
context:
space:
mode:
authorScott Ullrich <sullrich@pfsense.org>2010-12-18 16:43:32 -0500
committerScott Ullrich <sullrich@pfsense.org>2010-12-18 16:43:32 -0500
commitb8791a3151c93c05261933c52f19f8a531491c65 (patch)
treeeec8d99f92bbfa69c8a8fa406df8855ef5c49c86 /usr
parent4fdc80b14b51e7124a3807f13bfca9279b372557 (diff)
downloadpfsense-b8791a3151c93c05261933c52f19f8a531491c65.zip
pfsense-b8791a3151c93c05261933c52f19f8a531491c65.tar.gz
Restore encpass as well
Diffstat (limited to 'usr')
-rw-r--r--usr/local/www/installer/installer.php5
1 files changed, 3 insertions, 2 deletions
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>
OpenPOWER on IntegriCloud