Project

General

Profile

« Previous | Next » 

Revision d4e79776

Added by Scott Ullrich over 14 years ago

Correct reboot link

View differences:

usr/local/www/installer/installer.php
69 69
	$numdisks = -1;
70 70
	$lastdisk = "";
71 71
	$diskdefs = "";
72
	// First make sure we have a boot partition if any slices are encrypted
73
	foreach($disks as $disksa) {
74
		$fstype = $disksa['fstype'];
75
		if(stristr($fstype,".eli")) 
76
			$diskareas .=  "disk{$numdisks}-part=UFS 500 /boot\n";
77
	}
78 72
	// Run through the disks and create the conf areas for pc-sysinstaller
79 73
	foreach($disks as $disksa) {
80 74
		$fstype = $disksa['fstype'];
......
93 87
	
94 88
	$config = <<<EOF
95 89
# Sample configuration file for an installation using pc-sysinstall
96

  
90
# This file was automatically generated by installer.php
91
 
97 92
installMode=fresh
98 93
installInteractive=yes
99 94
installType=FreeBSD
......
118 113
# disk0-part=UFS 500 /boot
119 114
# disk0-part=UFS.eli 500 /
120 115
# disk0-part=UFS.eli 500 /usr
121
{$diskareaspre}
122 116
{$diskareas}
123
{$diskareaspass}
124 117

  
125 118
# Do it now!
126 119
commitDiskLabel
......
157 150
	fwrite($fd, "chmod a+rx /usr/local/bin/after_installation_routines.sh\n");
158 151
	fwrite($fd, "cd / && /usr/local/bin/after_installation_routines.sh\n");
159 152
	fwrite($fd, "mkdir /mnt/tmp\n");
160
//	fwrite($fd, "umount /mnt\n");
161 153
	fwrite($fd, "touch /tmp/install_complete\n");
162 154
	fclose($fd);
163 155
	exec("chmod a+rx /tmp/installer.sh");
......
303 295
	if($progress) 
304 296
		echo "\$('progressbar').style.width='{$progress}%';\n";
305 297
	if(file_exists("/tmp/install_complete")) {
306
		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";
298
		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";
307 299
		echo "\$('pbdiv').Fade();\n";
308 300
		unlink_if_exists("/tmp/installer.sh");
309 301
		file_put_contents("/tmp/installer_installer_running", "finished");

Also available in: Unified diff