summaryrefslogtreecommitdiffstats
path: root/usr
diff options
context:
space:
mode:
authorScott Ullrich <sullrich@pfsense.org>2010-12-17 14:32:24 -0500
committerScott Ullrich <sullrich@pfsense.org>2010-12-17 14:32:51 -0500
commitd48927b4eadc42c43fefa3ecf539a5467906b4d4 (patch)
treea97fbd1dff8a3d921391d66b21851bb3cffeb0e7 /usr
parentf889516190ab1ec29ab533c662d932bb4f02c392 (diff)
downloadpfsense-d48927b4eadc42c43fefa3ecf539a5467906b4d4.zip
pfsense-d48927b4eadc42c43fefa3ecf539a5467906b4d4.tar.gz
Supply encpass if needed
Diffstat (limited to 'usr')
-rw-r--r--usr/local/www/installer.php7
1 files changed, 5 insertions, 2 deletions
diff --git a/usr/local/www/installer.php b/usr/local/www/installer.php
index 9dc26e8..1be0720 100644
--- a/usr/local/www/installer.php
+++ b/usr/local/www/installer.php
@@ -69,6 +69,8 @@ function write_out_pc_sysinstaller_config($disk, $fstype = "UFS+S", $swapsize =
} else {
$diskareas = "disk0-part={$fstype} 0 /\n";
}
+ if($encpass)
+ $diskareaspass = "encpass={$encpass}\n";
$config = <<<EOF
# Sample configuration file for an installation using pc-sysinstall
@@ -94,6 +96,7 @@ commitDiskPart
# the flag "encpass=" should be entered:
# encpass=mypass
{$diskareas}
+{$diskareaspass}
# Do it now!
commitDiskLabel
@@ -363,9 +366,9 @@ EOF;
function body_html() {
global $g, $fstype;
$pfSversion = str_replace("\n", "", file_get_contents("/etc/version"));
- if(strstr($pfSversion, "1.2"))
+ if(strstr($pfSversion, "1.2"))
$one_two = true;
- $pgtitle = "{$g['product_name']}: " . gettext("Installer");
+ $pgtitle = array("{$g['product_name']}", gettext("Installer"));
include("head.inc");
echo <<<EOF
<body link="#0000CC" vlink="#0000CC" alink="#0000CC">
OpenPOWER on IntegriCloud