Correct reboot link

1 files changed, 3 insertions, 11 deletions

diff --git a/usr/local/www/installer/installer.php b/usr/local/www/installer/installer.php
index b9ac3e1..567f572 100644
--- a/usr/local/www/installer/installer.php
+++ b/usr/local/www/installer/installer.php
@@ -69,12 +69,6 @@ function write_out_pc_sysinstaller_config($disks, $bootmanager = "bsd") {
 	$numdisks = -1;
 	$lastdisk = "";
 	$diskdefs = "";
-	// First make sure we have a boot partition if any slices are encrypted
-	foreach($disks as $disksa) {
-		$fstype = $disksa['fstype'];
-		if(stristr($fstype,".eli")) 
-			$diskareas .=  "disk{$numdisks}-part=UFS 500 /boot\n";
-	}
 	// Run through the disks and create the conf areas for pc-sysinstaller
 	foreach($disks as $disksa) {
 		$fstype = $disksa['fstype'];
@@ -93,7 +87,8 @@ function write_out_pc_sysinstaller_config($disks, $bootmanager = "bsd") {
 	
 	$config = <<<EOF
 # Sample configuration file for an installation using pc-sysinstall
-
+# This file was automatically generated by installer.php
+ 
 installMode=fresh
 installInteractive=yes
 installType=FreeBSD
@@ -118,9 +113,7 @@ commitDiskPart
 # disk0-part=UFS 500 /boot
 # disk0-part=UFS.eli 500 /
 # disk0-part=UFS.eli 500 /usr
-{$diskareaspre}
 {$diskareas}
-{$diskareaspass}
 
 # Do it now!
 commitDiskLabel
@@ -157,7 +150,6 @@ function start_installation() {
 	fwrite($fd, "chmod a+rx /usr/local/bin/after_installation_routines.sh\n");
 	fwrite($fd, "cd / && /usr/local/bin/after_installation_routines.sh\n");
 	fwrite($fd, "mkdir /mnt/tmp\n");
-//	fwrite($fd, "umount /mnt\n");
 	fwrite($fd, "touch /tmp/install_complete\n");
 	fclose($fd);
 	exec("chmod a+rx /tmp/installer.sh");
@@ -303,7 +295,7 @@ function update_installer_status() {
 	if($progress) 
 		echo "\$('progressbar').style.width='{$progress}%';\n";
 	if(file_exists("/tmp/install_complete")) {
-		echo "\$('installerrunning').innerHTML='<img class=\"infoboxnpimg\" src=\"/themes/{$g['theme']}/images/icons/icon_exclam.gif\"> <font size=\"+1\">Installation completed.  Please <a href=\"reboot.php\">reboot</a> to continue';\n";
+		echo "\$('installerrunning').innerHTML='<img class=\"infoboxnpimg\" src=\"/themes/{$g['theme']}/images/icons/icon_exclam.gif\"> <font size=\"+1\">Installation completed.  Please <a href=\"/reboot.php\">reboot</a> to continue';\n";
 		echo "\$('pbdiv').Fade();\n";
 		unlink_if_exists("/tmp/installer.sh");
 		file_put_contents("/tmp/installer_installer_running", "finished");