summaryrefslogtreecommitdiffstats
path: root/usr
diff options
context:
space:
mode:
authorScott Ullrich <sullrich@pfsense.org>2010-08-01 18:10:38 -0400
committerScott Ullrich <sullrich@pfsense.org>2010-08-01 18:10:38 -0400
commit691f847549f79313a5b6ab0a435206c0f01e3057 (patch)
tree49efad5172393cae981c7caf596b264449688f67 /usr
parent429650edb7790154035d668ec12ccc3009055236 (diff)
downloadpfsense-691f847549f79313a5b6ab0a435206c0f01e3057.zip
pfsense-691f847549f79313a5b6ab0a435206c0f01e3057.tar.gz
Only check for file if install is complete
Diffstat (limited to 'usr')
-rw-r--r--usr/local/www/installer.php9
1 files changed, 4 insertions, 5 deletions
diff --git a/usr/local/www/installer.php b/usr/local/www/installer.php
index 5682dc0..135e0f2 100644
--- a/usr/local/www/installer.php
+++ b/usr/local/www/installer.php
@@ -102,7 +102,8 @@ function start_installation() {
if(!$fd) {
die("Could not open /tmp/installer.sh for writing");
exit;
- }
+ }
+ fwrite($fd, "rm /tmp/.pc-sysinstall/pc-sysinstall.log 2>/dev/null");
fwrite($fd, "/PCBSD/pc-sysinstall/pc-sysinstall -c /PCBSD/pc-sysinstall/examples/pfSense-install.cfg \n");
fwrite($fd, "chmod a+rx /usr/local/bin/after_installation_routines.sh\n");
fwrite($fd, "cd / && /usr/local/bin/after_installation_routines.sh\n");
@@ -122,8 +123,6 @@ function installer_find_first_disk() {
function update_installer_status() {
global $g;
- if(!file_exists("/tmp/.pc-sysinstall/pc-sysinstall.log"))
- return;
// Ensure status files exist
if(!file_exists("/tmp/installer_installer_running"))
touch("/tmp/installer_installer_running");
@@ -201,7 +200,7 @@ function update_installer_status() {
}
if($progress)
echo "\$('progressbar').style.width='{$progress}%';\n";
- if($progress == "100" && file_exists("/tmp/install_complete")) {
+ if(file_exists("/tmp/install_complete")) {
echo "\$('installerrunning').innerHTML='<font size=\"+1\">Installation completed. Please <a href=\"reboot.php\">reboot</a> to continue';\n";
unlink_if_exists("/tmp/installer.sh");
file_put_contents("/tmp/installer_installer_running", "finished");
@@ -351,7 +350,7 @@ function quickeasyinstall_gui() {
</tr>
</table>
<br/>
- <textarea name='installeroutput' id='installeroutput' rows="31" cols="80">
+ <textarea name='installeroutput' id='installeroutput' rows="31" cols="90">
</textarea>
</div>
</td>
OpenPOWER on IntegriCloud