summaryrefslogtreecommitdiffstats
path: root/usr/local
diff options
context:
space:
mode:
authorScott Ullrich <sullrich@pfsense.org>2010-12-22 15:41:29 -0500
committerScott Ullrich <sullrich@pfsense.org>2010-12-22 15:41:39 -0500
commit01184e213ecc00f29151acad9326dd218905c929 (patch)
treef670f80729458292c21d7fffed279b0cd9e1ea95 /usr/local
parent95b71980a0148a2d701e5c7e0f08d18f9053154e (diff)
downloadpfsense-01184e213ecc00f29151acad9326dd218905c929.zip
pfsense-01184e213ecc00f29151acad9326dd218905c929.tar.gz
misc comments
Diffstat (limited to 'usr/local')
-rw-r--r--usr/local/www/installer/installer.php13
1 files changed, 8 insertions, 5 deletions
diff --git a/usr/local/www/installer/installer.php b/usr/local/www/installer/installer.php
index 5e3c92f..fdb682a 100644
--- a/usr/local/www/installer/installer.php
+++ b/usr/local/www/installer/installer.php
@@ -1,6 +1,6 @@
<?php
/*
- installer.php (pfSense installer)
+ installer.php (pfSense webInstaller)
part of pfSense (http://www.pfsense.com/)
Copyright (C) 2010 Scott Ullrich <sullrich@gmail.com>
All rights reserved.
@@ -82,6 +82,8 @@ function easy_install($fstype = "UFS+S") {
$tmp_array['mountpoint'] = "/";
$tmp_array['fstype'] = $fstype;
$disk_setup[] = $tmp_array;
+ unset($tmp_array);
+ $tmp_array = array();
// Build the disk layout for SWAP
$tmp_array['disk'] = $first_disk;
$tmp_array['size'] = $swap_size;
@@ -99,11 +101,11 @@ function easy_install($fstype = "UFS+S") {
function write_out_pc_sysinstaller_config($disks, $bootmanager = "bsd") {
$diskareas = "";
$fd = fopen("/usr/sbin/pc-sysinstall/examples/pfSense-install.cfg", "w");
- if(!$fd) {
+ if(!$fd)
return true;
- }
if($bootmanager == "")
$bootmanager = "none";
+ // Yes, -1. We ++ early in loop.
$numdisks = -1;
$lastdisk = "";
$diskdefs = "";
@@ -347,7 +349,7 @@ function update_installer_status_win($status) {
global $g, $fstype, $savemsg;
echo "<script type=\"text/javascript\">\n";
echo " \$('installeroutput').value = '" . str_replace(htmlentities($status), "\n", "") . "';\n";
- echo "</script>";
+ echo "</script>\n";
}
function begin_install() {
@@ -630,6 +632,7 @@ EOFAMBASDF;
page_table_end();
end_html();
write_out_pc_sysinstaller_config($disks, $bootmanager);
+ // Serialize layout to disk so it can be read in later.
file_put_contents("/tmp/webInstaller_disk_layout.txt", serialize($disks));
file_put_contents("/tmp/webInstaller_disk_bootmanager.txt", serialize($bootmanager));
}
@@ -902,13 +905,13 @@ function installer_custom() {
</div>
EOF;
ob_flush();
+ // Read bootmanager setting from disk if found
if(file_exists("/tmp/webInstaller_disk_bootmanager.txt"))
$bootmanager = unserialize(file_get_contents("/tmp/webInstaller_disk_bootmanager.txt"));
if($bootmanager == "none")
$noneselected = " SELECTED";
if($bootmanager == "bsd")
$bsdeselected = " SELECTED";
-
if(!$disks) {
$custom_txt = gettext("ERROR: Could not find any suitable disks for installation.");
} else {
OpenPOWER on IntegriCloud